mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit) (#10301)

Browse source 
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
7ca2b46c SPIGOT-7594: Fix typo and include missing MinecraftExperimental annotation in Loot Table enum

CraftBukkit Changes:
176c0ad39 Fix copying BlockStates with fields (eg, Banner)
ee685bd2a Fix Camel not standing up when hurt
619936d4b Increase outdated build delay
This commit is contained in:
Jake Potrebic 2024-03-08 15:52:00 -08:00
commit 8b00b9a52d
10 changed files with 33 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

14
patches/server/CB-fixes.patch
View file

@ -37,11 +37,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
}
@Override
- protected void actuallyHurt(DamageSource source, float amount) {
+ protected boolean actuallyHurt(DamageSource source, float amount) { // Paper - Fix CB...
- // CraftBukkit start - void -> boolean
- protected boolean actuallyHurt(DamageSource damagesource, float f) {
- boolean hurt = super.actuallyHurt(damagesource, f);
- if (!hurt) {
- return hurt;
- }
- // CraftBukkit end
+ protected boolean actuallyHurt(DamageSource damagesource, float f) { // Paper - change return type to boolean
this.standUpInstantly();
- super.actuallyHurt(source, amount);
+ return super.actuallyHurt(source, amount); // Paper - Fix CB...
- return hurt; // CraftBukkit
+ return super.actuallyHurt(damagesource, f); // Paper - change return type to boolean
}
@Override