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

6
patches/server/0115-Add-ProjectileCollideEvent.patch
View file

@ -6,10 +6,10 @@ Subject: [PATCH] Add ProjectileCollideEvent
Deprecated now and replaced with ProjectileHitEvent
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index f80f015515e4da9bf9d41f7bc38341c018c90acc..62c1f7b63601fc8df3469c0e7ad2d75382bde72f 100644
index 012cbdbaf56a856879b00fb7664fc4eb0d1987c1..427c63945e207236fc2e5caa99e22b3f7b171854 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1265,6 +1265,17 @@ public class CraftEventFactory {
@@ -1264,6 +1264,17 @@ public class CraftEventFactory {
return CraftItemStack.asNMSCopy(bitem);
}
@ -27,7 +27,7 @@ index f80f015515e4da9bf9d41f7bc38341c018c90acc..62c1f7b63601fc8df3469c0e7ad2d753
public static ProjectileLaunchEvent callProjectileLaunchEvent(Entity entity) {
Projectile bukkitEntity = (Projectile) entity.getBukkitEntity();
ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity);
@@ -1289,8 +1300,15 @@ public class CraftEventFactory {
@@ -1288,8 +1299,15 @@ public class CraftEventFactory {
if (position.getType() == HitResult.Type.ENTITY) {
hitEntity = ((EntityHitResult) position).getEntity().getBukkitEntity();
}