mirror of
https://github.com/PaperMC/Paper.git
synced 2025-03-20 14:08:57 +01:00
SPIGOT-6682: Blocking with shield not reset after die
By: DerFrZocker <derrieple@gmail.com>
This commit is contained in:
parent
aab97ffee0
commit
4beaa19a39
1 changed files with 2 additions and 1 deletions
|
@ -863,7 +863,7 @@
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1634,4 +2020,144 @@
|
@@ -1634,4 +2020,145 @@
|
||||||
});
|
});
|
||||||
return this.a(itemstack, false, true) != null;
|
return this.a(itemstack, false, true) != null;
|
||||||
}
|
}
|
||||||
|
@ -979,6 +979,7 @@
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ this.setHealth(this.getMaxHealth());
|
+ this.setHealth(this.getMaxHealth());
|
||||||
|
+ this.clearActiveItem(); // CraftBukkit - SPIGOT-6682: Clear active item on reset
|
||||||
+ this.remainingFireTicks = 0;
|
+ this.remainingFireTicks = 0;
|
||||||
+ this.fallDistance = 0;
|
+ this.fallDistance = 0;
|
||||||
+ this.foodData = new FoodMetaData(this);
|
+ this.foodData = new FoodMetaData(this);
|
||||||
|
|
Loading…
Add table
Reference in a new issue