Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c919e94 Updated Upstream (Bukkit/CraftBukkit) (#8663)
This commit is contained in:
BillyGalbreath
2022-12-14 12:21:08 -06:00
parent db7d41a7dd
commit 0a4b64fbe6
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0006-Ridables.patch
View File

@@ -66,7 +66,7 @@ index 740eff44b2895f83099beb4bc0e705f4252edc12..9918cc39247037c0a8379071167c5560
public void doTick() {
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index d99baac236d7d4be09f351943971a9f60914be31..503323974eb4ee076636ef495d7c475d1ade00cd 100644
index bc7cbee5b5a789aaf42ac770a488eae16fdc9d19..400f974549319a4b3b0445c815a2e99756a2bc36 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -720,7 +720,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -5180,10 +5180,10 @@ index 6cd6cb256bde958416a0e4b13fc1d3df74f230fd..3ac836bd6fccf66771dc0141b9b6a25d
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index ae59a1259db4c4cef6f0cd128850229a63491845..b53d824bc0f964349e70097285700e5facd3bcdf 100644
index dd063e8b0df7505a96cd25dc5c797c0c04dfdfd0..7c2922c35f85be346a359d691a0c77c7c3a24726 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -544,6 +544,15 @@ public class CraftEventFactory {
@@ -545,6 +545,15 @@ public class CraftEventFactory {
// Paper end
craftServer.getPluginManager().callEvent(event);
@@ -5199,7 +5199,7 @@ index ae59a1259db4c4cef6f0cd128850229a63491845..b53d824bc0f964349e70097285700e5f
return event;
}
@@ -981,6 +990,7 @@ public class CraftEventFactory {
@@ -982,6 +991,7 @@ public class CraftEventFactory {
damageCause = DamageCause.ENTITY_EXPLOSION;
}
event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), entity.getBukkitEntity(), damageCause, modifiers, modifierFunctions, source.isCritical()); // Paper - add critical damage API
@@ -5207,7 +5207,7 @@ index ae59a1259db4c4cef6f0cd128850229a63491845..b53d824bc0f964349e70097285700e5f
}
event.setCancelled(cancelled);
@@ -1087,6 +1097,7 @@ public class CraftEventFactory {
@@ -1088,6 +1098,7 @@ public class CraftEventFactory {
} else {
entity.lastDamageCancelled = true; // SPIGOT-5339, SPIGOT-6252, SPIGOT-6777: Keep track if the event was canceled
}
@@ -5215,7 +5215,7 @@ index ae59a1259db4c4cef6f0cd128850229a63491845..b53d824bc0f964349e70097285700e5f
return event;
}
@@ -1146,6 +1157,7 @@ public class CraftEventFactory {
@@ -1147,6 +1158,7 @@ public class CraftEventFactory {
EntityDamageEvent event;
if (damager != null) {
event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, modifiers, modifierFunctions, critical); // Paper - add critical damage API