twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 12:42:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update upstream B/CB/S

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
Spigot-Server-Patches/Be-a-bit-more-informative-in-maxHealth-exception.patch
View File

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

7
Spigot-Server-Patches/Set-health-before-death-event.patch
View File

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

2
work/Bukkit

Submodule work/Bukkit updated: c5354dfc26...9335c0ba4c

2
work/CraftBukkit

Submodule work/CraftBukkit updated: 21e3b05522...83a9dbdef6

2
work/Spigot

Submodule work/Spigot updated: 078e2f8b3c...90f61bc448