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

Updated Upstream (Bukkit/CraftBukkit)

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:
2651717c SPIGOT-7292: Support for alpha channel in Color and a few improvements

CraftBukkit Changes:
dbc32ffa0 SPIGOT-7292: Support alpha channel in Display entities
cef8bd993 SPIGOT-7294: Call EntityDamageEvent for Interaction entity
This commit is contained in:
Nassim Jahnke 2023-03-16 10:07:12 +01:00
parent 4f933b2405
commit fe881073af
No known key found for this signature in database
GPG key ID: 6BE3B555EBC5982B
12 changed files with 44 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
patches/server/0110-Add-EntityZapEvent.patch
View file

@ -28,10 +28,10 @@ index efbf6b316a70b94e4bd490df8ebe77cd9f638ba4..cad8854cc7523d60c06ca1f03bfd4fbf
entitywitch.finalizeSpawn(world, world.getCurrentDifficultyAt(entitywitch.blockPosition()), MobSpawnType.CONVERSION, (SpawnGroupData) null, (CompoundTag) null);
entitywitch.setNoAi(this.isNoAi());
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 7bcbd1aac8826c76b74ef0e517b9d94e615df347..8451c482eb92e7f9394490c9380cd1d6357306dc 100644
index edab1f25747a7492760a31a90e25b37678b48c64..f1e0cc9b558fd825e6ef1bd26ccec488153fd21d 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1158,6 +1158,14 @@ public class CraftEventFactory {
@@ -1162,6 +1162,14 @@ public class CraftEventFactory {
return event;
}