mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@7b9a4729 Fix inverted disabled in CraftCrafter#setSlotDisabled (#13195) PaperMC/Paper@3799cbeb Use Adventure properties default override provider to set a global flattener nesting limit (#13156) PaperMC/Paper@ae1e6b72 Add PersistentDataContainerView#getSize (#13157) PaperMC/Paper@dd8f9f86 Expose PlayerConnection#isConnected (#13166) PaperMC/Paper@952a024f Fix some issues with PlayerLeashEntityEvent (#13015) PaperMC/Paper@7845cba0 Fix help.yml index-topics not working for non-console senders (#13193)
This commit is contained in:
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
|
||||
version = 1.21.10-R0.1-SNAPSHOT
|
||||
|
||||
mcVersion = 1.21.10
|
||||
paperCommit = 81b7a578643f413e4f294f756f9bb58282d1b2de
|
||||
paperCommit = 7845cba0a5df21e6e9d815c99503988db2ea5615
|
||||
|
||||
org.gradle.configuration-cache = true
|
||||
org.gradle.caching = true
|
||||
|
||||
@@ -36,10 +36,10 @@ index 15686e234b7e1a2833c0962fbead94c0cfd0a1e4..a80003a07834a9eafa554afd13afa13a
|
||||
+ // Purpur end - Ridables
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
index 6744a9f4cfe813a2593bad67b433bfb2c774a636..60350a65c8073bef3acb8432e41334430eab01cd 100644
|
||||
index cc108383fa62b3ea5781c1ac58f9f8a24412e6c3..0b536e4ee904cba3a724d98d491185cfded3d723 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
@@ -518,6 +518,15 @@ public class CraftEventFactory {
|
||||
@@ -517,6 +517,15 @@ public class CraftEventFactory {
|
||||
}
|
||||
craftServer.getPluginManager().callEvent(event);
|
||||
|
||||
@@ -55,7 +55,7 @@ index 6744a9f4cfe813a2593bad67b433bfb2c774a636..60350a65c8073bef3acb8432e4133443
|
||||
return event;
|
||||
}
|
||||
|
||||
@@ -1050,6 +1059,7 @@ public class CraftEventFactory {
|
||||
@@ -1049,6 +1058,7 @@ public class CraftEventFactory {
|
||||
EntityDamageEvent event;
|
||||
if (damager != null) {
|
||||
event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, bukkitDamageSource, modifiers, modifierFunctions, critical);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
|
||||
@@ -337,6 +_,12 @@
|
||||
@@ -342,6 +_,12 @@
|
||||
|
||||
@Override
|
||||
public Location getLocation() {
|
||||
@@ -13,7 +13,7 @@
|
||||
CompoundTag data = this.getData();
|
||||
if (data == null) {
|
||||
return null;
|
||||
@@ -574,4 +_,183 @@
|
||||
@@ -579,4 +_,183 @@
|
||||
manager.save();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
||||
@@ -667,4 +_,285 @@
|
||||
@@ -672,4 +_,285 @@
|
||||
}
|
||||
|
||||
// Paper end - data component API
|
||||
|
||||
Reference in New Issue
Block a user