diff --git a/patches/net/minecraft/crash/CrashReport.java.patch b/patches/net/minecraft/crash/CrashReport.java.patch index 7f2ecb5..c54e540 100644 --- a/patches/net/minecraft/crash/CrashReport.java.patch +++ b/patches/net/minecraft/crash/CrashReport.java.patch @@ -34,7 +34,7 @@ + this.theReportCategory.addCrashSectionCallable("KCauldron Version", new Callable() { + @Override + public String call() throws Exception { -+ return String.format("%s:%s:%s", KCauldron.getGroup(), KCauldron.getChannel(), KCauldron.getCurrentVersion()); ++ return String.format("%s:%s:%s %s", KCauldron.getGroup(), KCauldron.getChannel(), KCauldron.getCurrentVersion(), KCauldron.isOfficial() ? "Official" : "UNOFFICIAL DON'T REPORT THIS CRASH"); + } + }); + this.theReportCategory.addCrashSectionCallable("Plugins", new Callable() { diff --git a/src/main/java/kcauldron/ReverseClonner.java b/src/main/java/kcauldron/ReverseClonner.java index 18c4b68..014a9ed 100644 --- a/src/main/java/kcauldron/ReverseClonner.java +++ b/src/main/java/kcauldron/ReverseClonner.java @@ -14,7 +14,7 @@ public enum ReverseClonner { EntityPlayerMP shadowCopy = new EntityPlayerMP(player.mcServer, (WorldServer) player.worldObj, player.getGameProfile(), new ItemInWorldManager(player.worldObj)); shadowCopy.clonePlayer(player, true); - if (wasDeath) { + if (wasDeath && !player.worldObj.getGameRules().getGameRuleBooleanValue("keepInventory")) { player.inventory.clearInventory(null, -1); player.inventoryContainer = new ContainerPlayer(player.inventory, !player.worldObj.isRemote, player); }