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

Updated Upstream (Bukkit/CraftBukkit) (#8991)

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:
2b4582fb SPIGOT-5916: getLastColors does not work with the rgb colors

CraftBukkit Changes:
f7707086d SPIGOT-7299: Fix indirect/anvil damage events and minor improvements
This commit is contained in:
Jake Potrebic 2023-03-18 10:05:04 -07:00 • committed by GitHub
parent 79db3a2a4b
commit 5730a94208
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
225 changed files with 36 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

14
patches/server/0685-Add-critical-damage-API.patch
View file

@ -28,7 +28,7 @@ index 9ec30af85095a9993076dafacbecc21b580d06ce..72d62387bfdcbf8e69fe433145be81fb
+ // Paper end
}
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 496e10067267df07db9fa2570786d3b281f432c1..166e39a8c6854814dc47c995d23d2d572b56adab 100644
index b716f297462b29c79500820859b9735c3576a2be..dcbf1e6e494493d81b7a10454a531b0fb719e024 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -1255,7 +1255,7 @@ public abstract class Player extends LivingEntity {
@ -71,10 +71,10 @@ index 6486fa86e4bf3c90c09c0425d825bab568a68757..8257563afc3fe04c9e821da363b1f3f6
int k = entity.getRemainingFireTicks();
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index d39a4e21fa2da3fec535ca62028f1c5ac92e8c96..31b955a5424bb9d00c763764f50c9f7605d5317c 100644
index 6c891278af90a0a7ad4cf28b85284cceb7e63df1..f6f76a659257ae86f868f3af1280565c108678ab 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -970,7 +970,7 @@ public class CraftEventFactory {
@@ -969,7 +969,7 @@ public class CraftEventFactory {
} else {
damageCause = DamageCause.ENTITY_EXPLOSION;
}
@ -83,16 +83,16 @@ index d39a4e21fa2da3fec535ca62028f1c5ac92e8c96..31b955a5424bb9d00c763764f50c9f76
}
event.setCancelled(cancelled);
@@ -999,7 +999,7 @@ public class CraftEventFactory {
@@ -998,7 +998,7 @@ public class CraftEventFactory {
cause = DamageCause.SONIC_BOOM;
}
- return CraftEventFactory.callEntityDamageEvent(damager, entity, cause, modifiers, modifierFunctions, cancelled);
+ return CraftEventFactory.callEntityDamageEvent(damager, entity, cause, modifiers, modifierFunctions, cancelled, source.isCritical()); // Paper - add critical damage API
} else if (sourceType == DamageTypes.OUT_OF_WORLD) {
} else if (source.is(DamageTypes.OUT_OF_WORLD)) {
EntityDamageEvent event = new EntityDamageByBlockEvent(null, entity.getBukkitEntity(), DamageCause.VOID, modifiers, modifierFunctions);
event.setCancelled(cancelled);
@@ -1069,7 +1069,7 @@ public class CraftEventFactory {
@@ -1068,7 +1068,7 @@ public class CraftEventFactory {
} else {
throw new IllegalStateException(String.format("Unhandled damage of %s by %s from %s", entity, damager.getHandle(), source.getMsgId()));
}
@ -101,7 +101,7 @@ index d39a4e21fa2da3fec535ca62028f1c5ac92e8c96..31b955a5424bb9d00c763764f50c9f76
event.setCancelled(cancelled);
CraftEventFactory.callEvent(event);
if (!event.isCancelled()) {
@@ -1114,20 +1114,28 @@ public class CraftEventFactory {
@@ -1113,20 +1113,28 @@ public class CraftEventFactory {
}
if (cause != null) {