Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-24 11:38:29 +01:00
Code Issues Projects Releases Wiki Activity

Fixed EntityDeathEvent not throwing for Ghasts and Pig Zombies (fixes issue #13)

Browse Source
This commit is contained in:
Nathan Adams 2011-11-27 04:22:24 +00:00
parent 8d49f500ec
commit f6dc6745ed
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/net/minecraft/server/EntityGhast.java
View File

@ -1,7 +1,10 @@
package net.minecraft.server; package net.minecraft.server;
// CraftBukkit start // CraftBukkit start
import java.util.List;
import org.bukkit.craftbukkit.entity.CraftEntity; import org.bukkit.craftbukkit.entity.CraftEntity;
import org.bukkit.craftbukkit.event.CraftEventFactory;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.event.entity.EntityTargetEvent;
// CraftBukkit end // CraftBukkit end
@ -196,19 +199,24 @@ public class EntityGhast extends EntityFlying implements IMonster {
} }
protected void a(boolean flag, int i) { protected void a(boolean flag, int i) {
// CraftBukkit start
List<org.bukkit.inventory.ItemStack> loot = new java.util.ArrayList<org.bukkit.inventory.ItemStack>();
int j = this.random.nextInt(2) + this.random.nextInt(1 + i); int j = this.random.nextInt(2) + this.random.nextInt(1 + i);
int k; int k;
for (k = 0; k < j; ++k) { if (j > 0) {
this.b(Item.GHAST_TEAR.id, 1); loot.add(new CraftItemStack(Item.GHAST_TEAR.id, j));
} }
j = this.random.nextInt(3) + this.random.nextInt(1 + i); j = this.random.nextInt(3) + this.random.nextInt(1 + i);
for (k = 0; k < j; ++k) { if (j > 0) {
this.b(Item.SULPHUR.id, 1); loot.add(new CraftItemStack(Item.SULPHUR.id, j));
} }
CraftEventFactory.callEntityDeathEvent(this, loot);
// CraftBukkit end
} }
protected float o() { protected float o() {

14
src/main/java/net/minecraft/server/EntityPigZombie.java
View File

@ -4,6 +4,8 @@ import java.util.List;
// CraftBukkit start // CraftBukkit start
import org.bukkit.craftbukkit.entity.CraftEntity; import org.bukkit.craftbukkit.entity.CraftEntity;
import org.bukkit.craftbukkit.event.CraftEventFactory;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.event.entity.EntityTargetEvent;
// CraftBukkit end // CraftBukkit end
@ -110,19 +112,23 @@ public class EntityPigZombie extends EntityZombie {
} }
protected void a(boolean flag, int i) { protected void a(boolean flag, int i) {
// CraftBukkit start
List<org.bukkit.inventory.ItemStack> loot = new java.util.ArrayList<org.bukkit.inventory.ItemStack>();
int j = this.random.nextInt(2 + i); int j = this.random.nextInt(2 + i);
int k; int k;
for (k = 0; k < j; ++k) { if (j > 0) {
this.b(Item.ROTTEN_FLESH.id, 1); loot.add(new CraftItemStack(Item.ROTTEN_FLESH.id, j));
} }
j = this.random.nextInt(2 + i); j = this.random.nextInt(2 + i);
for (k = 0; k < j; ++k) { if (j > 0) {
this.b(Item.GOLD_NUGGET.id, 1); loot.add(new CraftItemStack(Item.GOLD_NUGGET.id, j));
} }
CraftEventFactory.callEntityDeathEvent(this, loot);
// CraftBukkit end
} }
protected int e() { protected int e() {