Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17:42 +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@d8d59e0 Fix NPE sending resource pack without prompt
PaperMC/Paper@5a9afbe Fixes issues in the suppress dismount cancellation patch (#10735)
PaperMC/Paper@0ad09de Make PaperSimplePluginClassLoader show class which is not found
This commit is contained in:
granny
2024-05-19 15:11:01 -07:00
parent 9dcfdf13c2
commit 88aa731cf3
14 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0255-Remove-Mojang-Profiler.patch
View File

@@ -826,7 +826,7 @@ index b727c707ef46a9387fc225b51ef050c6baff1c74..7924e3c597164f71056cd58dd167ee8b
while (iterator.hasNext()) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 326520c7bb551ca0712454324921a5c59ba6abb1..3670c65cf3c65c57d0e40862d1905c1dc3d158b6 100644
index d3d6febb1942b59e6e0e90259acdef22d344a853..12d55da2cd14a497effe16f5d33b5bcba6cb22c1 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1317,7 +1317,7 @@ public class ServerPlayer extends Player {
@@ -1085,7 +1085,7 @@ index a715ecf4a8ac91d3e5e5c6269d89e54b2c1cd279..223c3665126c576eddb1a8f7c9f5bc60
};
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 68e8f9913055219486ce19d95dcf9d7c76e08082..2c3ad553272ad651e6ca26917719e6d9fffdef68 100644
index 81c10d07d28e5158e0f248e02939f562fa20d65c..597c8934264d4d541494e7ce2375a0b403dcc68c 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -897,7 +897,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1153,7 +1153,7 @@ index 68e8f9913055219486ce19d95dcf9d7c76e08082..2c3ad553272ad651e6ca26917719e6d9
}
}
// Paper start - detailed watchdog information
@@ -3258,7 +3258,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3264,7 +3264,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
ServerLevel worldserver1 = minecraftserver.getLevel(resourcekey);
if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit
@@ -1162,7 +1162,7 @@ index 68e8f9913055219486ce19d95dcf9d7c76e08082..2c3ad553272ad651e6ca26917719e6d9
this.portalTime = i;
// Paper start - Add EntityPortalReadyEvent
io.papermc.paper.event.entity.EntityPortalReadyEvent event = new io.papermc.paper.event.entity.EntityPortalReadyEvent(this.getBukkitEntity(), worldserver1 == null ? null : worldserver1.getWorld(), org.bukkit.PortalType.NETHER);
@@ -3276,7 +3276,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3282,7 +3282,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
} // Paper - Add EntityPortalReadyEvent
// CraftBukkit end
@@ -1171,7 +1171,7 @@ index 68e8f9913055219486ce19d95dcf9d7c76e08082..2c3ad553272ad651e6ca26917719e6d9
}
this.isInsidePortal = false;
@@ -3736,14 +3736,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3742,14 +3742,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
// Paper end - Fix item duplication and teleport issues
if (this.level() instanceof ServerLevel && !this.isRemoved()) {
@@ -1188,7 +1188,7 @@ index 68e8f9913055219486ce19d95dcf9d7c76e08082..2c3ad553272ad651e6ca26917719e6d9
PortalInfo shapedetectorshape = (location == null) ? this.findDimensionEntryPoint(worldserver) : new PortalInfo(new Vec3(location.x(), location.y(), location.z()), Vec3.ZERO, this.yRot, this.xRot, worldserver, null); // CraftBukkit
if (shapedetectorshape == null) {
@@ -3782,7 +3782,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3788,7 +3788,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
this.unRide();
// CraftBukkit end
@@ -1197,7 +1197,7 @@ index 68e8f9913055219486ce19d95dcf9d7c76e08082..2c3ad553272ad651e6ca26917719e6d9
// Paper start - Fix item duplication and teleport issues
if (this instanceof Mob) {
((Mob) this).dropLeash(true, true); // Paper drop lead
@@ -3809,10 +3809,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3815,10 +3815,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
this.removeAfterChangingDimensions();
@@ -1211,7 +1211,7 @@ index 68e8f9913055219486ce19d95dcf9d7c76e08082..2c3ad553272ad651e6ca26917719e6d9
}
} else {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 3603e26b253c8489d11784f260b38bc7bc8e69e7..cba8fd846bfe8279252e232277d81a59349d3511 100644
index 93670b0ca36eed241075168e5724fcffb14e83e3..7c020efc033ecdd0582ba972063d6de486699498 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -423,7 +423,7 @@ public abstract class LivingEntity extends Entity implements Attackable {