upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 16:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better Soulstone Handling

Browse Source
This commit is contained in:
Kam committed 2024-03-26 17:49:34 -04:00
1 parent 89f97c35df
commit 90a788ed47
3 files changed
+11 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/ServerEventsHandler.java
+3 -3
View File
@@ -69,7 +69,7 @@ public class ServerEventsHandler {
return;
}
if(!isRemote && item.getItem() == CustomItems.soulstoneEmpty && event.target instanceof EntityLivingBase) {
if(!isRemote && item.getItem() == CustomItems.soulstoneEmpty && npcInteracted) {
((ItemSoulstoneEmpty)item.getItem()).store((EntityLivingBase)event.target, item, event.entityPlayer);
if(ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER){
LogWriter.script(String.format("[%s] (Player) %s PICKED ENTITY %s", "SOULSTONE", event.entityPlayer.getCommandSenderName(), event.target));
@@ -77,7 +77,7 @@ public class ServerEventsHandler {
}
if(item.getItem() == CustomItems.wand && npcInteracted && !isRemote){
if (!CustomNpcsPermissions.Instance.hasPermission(event.entityPlayer, CustomNpcsPermissions.NPC_GUI)){
if (!CustomNpcsPermissions.hasPermission(event.entityPlayer, CustomNpcsPermissions.NPC_GUI)){
return;
}
event.setCanceled(true);
@@ -87,7 +87,7 @@ public class ServerEventsHandler {
}
}
else if(item.getItem() == CustomItems.cloner && !isRemote && !(event.target instanceof EntityPlayer)){
if(!CustomNpcsPermissions.Instance.hasPermission(event.entityPlayer, CustomNpcsPermissions.TOOL_CLONER))
if(!CustomNpcsPermissions.hasPermission(event.entityPlayer, CustomNpcsPermissions.TOOL_CLONER))
return;
NBTTagCompound compound = new NBTTagCompound();
if(!event.target.writeToNBTOptional(compound))