diff --git a/resources/assets/enderio/config/PoweredSpawnerConfig_User.json b/resources/assets/enderio/config/PoweredSpawnerConfig_User.json index 5b46a94d..79a81681 100644 --- a/resources/assets/enderio/config/PoweredSpawnerConfig_User.json +++ b/resources/assets/enderio/config/PoweredSpawnerConfig_User.json @@ -4,6 +4,6 @@ "costMultiplier": { }, - "_comment": "Adding a blackList section will complete replace the one in the core file" + "_comment": "Adding a blackList section will complete replace the one in the core file. Make sure you add a comma at the end of this line if adding a blacklist" } \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java index 03e8edb8..d249e2d1 100644 --- a/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java @@ -53,7 +53,7 @@ public class GuiSoulBinder extends GuiMachineBase { super.actionPerformed(b); if(b.id == PLAYER_XP_ID) { int xp = XpUtil.getPlayerXP(Minecraft.getMinecraft().thePlayer); - if(xp > 0) { + if(xp > 0 || Minecraft.getMinecraft().thePlayer.capabilities.isCreativeMode) { PacketHandler.INSTANCE.sendToServer(new PacketDrainPlayerXP(tileEntity, tileEntity.getCurrentlyRequiredLevel())); SoundUtil.playClientSoundFX("random.orb", tileEntity); } diff --git a/src/main/java/crazypants/enderio/xp/PacketDrainPlayerXP.java b/src/main/java/crazypants/enderio/xp/PacketDrainPlayerXP.java index 94dbccd5..d6b867e2 100644 --- a/src/main/java/crazypants/enderio/xp/PacketDrainPlayerXP.java +++ b/src/main/java/crazypants/enderio/xp/PacketDrainPlayerXP.java @@ -49,8 +49,12 @@ public class PacketDrainPlayerXP extends MessageTileEntity implement EntityPlayer player = ctx.getServerHandler().playerEntity; TileEntity tile = message.getTileEntity(player.worldObj); if (tile instanceof IHaveExperience) { - IHaveExperience xpTile = (IHaveExperience)tile; - xpTile.getContainer().drainPlayerXpToReachLevel(player, message.targetLevel); + IHaveExperience xpTile = (IHaveExperience)tile; + if(player.capabilities.isCreativeMode) { + xpTile.getContainer().addExperience(XpUtil.getExperienceForLevel(message.targetLevel)); + } else { + xpTile.getContainer().drainPlayerXpToReachLevel(player, message.targetLevel); + } } return null; }