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
src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
View File

@ -375,9 +375,10 @@ public class CraftEventFactory {
return event;
}
public static PlayerDeathEvent callPlayerDeathEvent(net.minecraft.entity.player.EntityPlayerMP victim, List<org.bukkit.inventory.ItemStack> drops, String deathMessage) {
public static PlayerDeathEvent callPlayerDeathEvent(net.minecraft.entity.player.EntityPlayerMP victim, List<org.bukkit.inventory.ItemStack> drops, String deathMessage, boolean keepInventory) {
CraftPlayer entity = victim.getBukkitEntity();
PlayerDeathEvent event = new PlayerDeathEvent(entity, drops, victim.getExpReward(), 0, deathMessage);
event.setKeepInventory(keepInventory);
//org.bukkit.World world = entity.getWorld();
Bukkit.getServer().getPluginManager().callEvent(event);
@ -386,6 +387,7 @@ public class CraftEventFactory {
victim.newTotalExp = event.getNewTotalExp();
victim.expToDrop = event.getDroppedExp();
victim.newExp = event.getNewExp();
if (event.getKeepInventory()) return event;
victim.capturedDrops.clear(); // Cauldron - we must clear pre-capture to avoid duplicates
for (org.bukkit.inventory.ItemStack stack : event.getDrops()) {

4
src/main/resources/fmlversion.properties
View File

@ -1,6 +1,6 @@
fmlbuild.major.number=7
fmlbuild.minor.number=10
fmlbuild.revision.number=85
fmlbuild.build.number=1291
fmlbuild.revision.number=97
fmlbuild.build.number=1343
fmlbuild.mcversion=1.7.10
fmlbuild.mcpversion=9.05