Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-30 21:07:36 +01:00
Code Issues Projects Releases Wiki Activity

Moved inventory cleaning to occur after the event is called to preserve the exact state of the inventory for plugin use.

Browse Source
This commit is contained in:
EvilSeph 2011-05-09 15:53:53 -04:00
parent 0faaf5af8a
commit 5ca0a881ad
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/net/minecraft/server/EntityPlayer.java
View File

@ -102,14 +102,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
for (int i = 0; i < inventory.items.length; ++i) { for (int i = 0; i < inventory.items.length; ++i) {
if (inventory.items[i] != null) { if (inventory.items[i] != null) {
loot.add(new CraftItemStack(inventory.items[i])); loot.add(new CraftItemStack(inventory.items[i]));
inventory.items[i] = null;
} }
} }
for (int i = 0; i < inventory.armor.length; ++i) { for (int i = 0; i < inventory.armor.length; ++i) {
if (inventory.armor[i] != null) { if (inventory.armor[i] != null) {
loot.add(new CraftItemStack(inventory.armor[i])); loot.add(new CraftItemStack(inventory.armor[i]));
inventory.armor[i] = null;
} }
} }
@ -120,6 +118,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
EntityDeathEvent event = new EntityDeathEvent(craftEntity, loot); EntityDeathEvent event = new EntityDeathEvent(craftEntity, loot);
server.getPluginManager().callEvent(event); server.getPluginManager().callEvent(event);
// CraftBukkit - we clean the player's inventory after the EntityDeathEvent is called so plugins can get the exact state of the inventory.
for (int i = 0; i < inventory.items.length; ++i) {
inventory.items[i] = null;
}
for (int i = 0; i < inventory.armor.length; ++i) {
inventory.armor[i] = null;
}
for (org.bukkit.inventory.ItemStack stack: event.getDrops()) { for (org.bukkit.inventory.ItemStack stack: event.getDrops()) {
cworld.dropItemNaturally(craftEntity.getLocation(), stack); cworld.dropItemNaturally(craftEntity.getLocation(), stack);
} }
@ -132,7 +139,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
if (this.bG > 0) { if (this.bG > 0) {
return false; return false;
} else { } else {
if (!this.world.pvpMode) { // CraftBukkit this.b.pvpMode -> this.world.pvpMode if (!this.world.pvpMode) { // CraftBukkit this.b.pvpMode -> this.world.pvpMode
if (entity instanceof EntityHuman) { if (entity instanceof EntityHuman) {
return false; return false;
} }