Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-10 10:17:38 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-3869: More resurrect fixes

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2018-03-24 16:13:17 +11:00
parent 72f49ebfa1
commit 26e73eb61e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
paper-server/nms-patches/EntityLiving.patch
View File

@ -326,7 +326,7 @@
this.aA = 0.0F;
Entity entity1 = damagesource.getEntity();
@@ -833,18 +981,28 @@
@@ -833,19 +981,29 @@
EnumHand[] aenumhand = EnumHand.values();
int i = aenumhand.length;
@ -346,6 +346,7 @@
}
- if (itemstack != null) {
- if (this instanceof EntityPlayer) {
+ EntityResurrectEvent event = new EntityResurrectEvent((LivingEntity) this.getBukkitEntity());
+ event.setCancelled(itemstack == null);
+ this.world.getServer().getPluginManager().callEvent(event);
@ -354,10 +355,11 @@
+ if (!itemstack1.isEmpty()) {
+ itemstack1.subtract(1);
+ }
+ // CraftBukkit end
if (this instanceof EntityPlayer) {
+ if (itemstack != null && this instanceof EntityPlayer) {
+ // CraftBukkit end
EntityPlayer entityplayer = (EntityPlayer) this;
entityplayer.b(StatisticList.b(Items.cY));
@@ -859,7 +1017,7 @@
this.world.broadcastEntityEffect(this, (byte) 35);
}