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@abfb6b2 more work on adventure codecs
PaperMC/Paper@b42a1da Use uuid param in setResourcePack
PaperMC/Paper@bcbe5dc Fix `PlayerInteractEvent#getClickedBlock()` returning wrong block in adventure mode (#10019)
PaperMC/Paper@166761f Update and clean up api dependencies (#10018)
PaperMC/Paper@3434a6f Update key gen for 1.20.4 (#10015)
PaperMC/Paper@dd16335 fix NPE when iterating over default drops (#10017)
This commit is contained in:
granny
2023-12-10 16:59:05 -08:00
parent a0b716fb61
commit 454f265fbf
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,7 +66,7 @@ index b0e698b2532ed6af84ca2dd0d8b1c795921c5823..d5940e560ea890f7f017ff9c37939a48
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 9073db9ad3627633f46314ae936d584fa400a9ce..41f3415c6c1b7a3ee2c733445bfefdc51089ecb5 100644
index 30ccbab1586a656e0ae41d7406525fb02d9e025b..bec249a47f1fbcabd6a121399d19d71e21edccae 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2714,6 +2714,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -5195,7 +5195,7 @@ index aa4dbf91cf6da329fdcacbde98bb870eb48e8f5c..fed6671e518b2f1601bbf4154195a844
+ // 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 e0f80414e01852b6f48c173dc2343ec928147e2f..2d3d10c8cbf8e88f2c897a476041a094b91fa0e2 100644
index f5a5ae30dfba21d5cf3990c046cfe41547e8a87a..7feace95794a2e1e4b0b14b5d0bc236db352ff65 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -594,6 +594,15 @@ public class CraftEventFactory {
@@ -5214,7 +5214,7 @@ index e0f80414e01852b6f48c173dc2343ec928147e2f..2d3d10c8cbf8e88f2c897a476041a094
return event;
}
@@ -1071,6 +1080,7 @@ public class CraftEventFactory {
@@ -1073,6 +1082,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
@@ -5222,7 +5222,7 @@ index e0f80414e01852b6f48c173dc2343ec928147e2f..2d3d10c8cbf8e88f2c897a476041a094
}
event.setCancelled(cancelled);
@@ -1185,6 +1195,7 @@ public class CraftEventFactory {
@@ -1187,6 +1197,7 @@ public class CraftEventFactory {
} else {
entity.lastDamageCancelled = true; // SPIGOT-5339, SPIGOT-6252, SPIGOT-6777: Keep track if the event was canceled
}
@@ -5230,7 +5230,7 @@ index e0f80414e01852b6f48c173dc2343ec928147e2f..2d3d10c8cbf8e88f2c897a476041a094
return event;
}
@@ -1248,6 +1259,7 @@ public class CraftEventFactory {
@@ -1250,6 +1261,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