xjboss/KCauldronX
3
0
Fork 1
Code Releases Activity

Update to Forge 1343. Small fixes.

Browse Source
This commit is contained in:
gamerforEA
2015-03-30 10:25:29 +03:00
parent 3c203341c9
commit 6f8f13347d
16 changed files with 203 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/net/minecraft/entity/player/EntityPlayerMP.java.patch
View File

@ -284,7 +284,7 @@
+ IChatComponent chatmessage = this.func_110142_aN().func_151521_b();
+ String deathmessage = chatmessage.getUnformattedText();
+ org.bukkit.event.entity.PlayerDeathEvent event = CraftEventFactory.callPlayerDeathEvent(this, loot, deathmessage);
+ org.bukkit.event.entity.PlayerDeathEvent event = CraftEventFactory.callPlayerDeathEvent(this, loot, deathmessage, keepInventory);
+ String deathMessage = event.getDeathMessage();
+
+ if (deathMessage != null && deathMessage.length() > 0)
@ -299,7 +299,7 @@
+ }
+ }
+
+ if (!keepInventory)
+ if (!event.getKeepInventory())
+ {
+ // Cauldron start - rework CraftBukkit logic to support Forge better
+ this.inventory.clearInventory(null, -1); // CraftBukkit - we clean the player's inventory after the EntityDeathEvent is called so plugins can get the exact state of the inventory.