Update upstream B/CB/S

This commit is contained in:
Zach Brown 2016-07-30 18:02:34 -05:00
parent 163d33a68b
commit 4db0ba851c
5 changed files with 7 additions and 8 deletions

View file

@ -19,5 +19,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ + (this instanceof CraftPlayer ? ", player: " + this.getName() + ')' : ')'));
}
if (entity instanceof EntityPlayer && health == 0) {
if (health == 0) {
--

View file

@ -30,10 +30,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ if (com.destroystokyo.paper.PaperConfig.setHealthBeforeDeathEvent) {
+ this.getHandle().setHealth((float) health);
+ }
+ // Paper end
+
if (entity instanceof EntityPlayer && health == 0) {
((EntityPlayer) entity).die(DamageSource.GENERIC);
if (health == 0) {
getHandle().die(DamageSource.GENERIC);
}
- getHandle().setHealth((float) health);

@ -1 +1 @@
Subproject commit c5354dfc2689616b92a74feea44b7fa5ce3238ee
Subproject commit 9335c0ba4cba58315c014ec460f734f180ab571d

@ -1 +1 @@
Subproject commit 21e3b055225dade6100342632f059509ca638c2a
Subproject commit 83a9dbdef609f7e8dfd4c0a5758be72fe732d8c9

@ -1 +1 @@
Subproject commit 078e2f8b3c4d46cfc88cef5a0818891aeca78a2e
Subproject commit 90f61bc448cdf47982cbeadcad280f229fe10b24