Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +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@77c763b Fix PlayerShearBlockEvent drops ignored for Pumpkin (#10956)
PaperMC/Paper@76c2f16 Fix wrong diff applying delta twice (#10959)
This commit is contained in:
granny
2024-06-22 19:19:32 -07:00
parent 21ec259c5d
commit 9efd5fcda1
10 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0251-Remove-Mojang-Profiler.patch
View File

@@ -1078,7 +1078,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 496551820d0357da9c5e89dd989d31b43fbfeb18..99c01f0328fab0a71a888dd57c74e9771e9e6bb8 100644
index 5c0157a5f54e9de21398ccb3421850b356d1751e..541fbd5b90cc6a2dd98733bc90602256d2ef59ed 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -859,7 +859,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1146,7 +1146,7 @@ index 496551820d0357da9c5e89dd989d31b43fbfeb18..99c01f0328fab0a71a888dd57c74e977
}
}
}
@@ -3143,7 +3143,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3142,7 +3142,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
this.processPortalCooldown();
if (this.portalProcess != null) {
if (this.portalProcess.processPortalTeleportation(worldserver, this, this.canUsePortal(false))) {
@@ -1155,7 +1155,7 @@ index 496551820d0357da9c5e89dd989d31b43fbfeb18..99c01f0328fab0a71a888dd57c74e977
this.setPortalCooldown();
DimensionTransition dimensiontransition = this.portalProcess.getPortalDestination(worldserver, this);
@@ -3155,7 +3155,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3154,7 +3154,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
}
@@ -1164,7 +1164,7 @@ index 496551820d0357da9c5e89dd989d31b43fbfeb18..99c01f0328fab0a71a888dd57c74e977
} else if (this.portalProcess.hasExpired()) {
this.portalProcess = null;
}
@@ -3656,7 +3656,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3655,7 +3655,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
}
@@ -1173,7 +1173,7 @@ index 496551820d0357da9c5e89dd989d31b43fbfeb18..99c01f0328fab0a71a888dd57c74e977
Entity entity2 = worldserver1.dimension() == worldserver.dimension() ? this : this.getType().create(worldserver1);
if (entity2 != null) {
@@ -3692,7 +3692,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3691,7 +3691,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
teleportTarget.postDimensionTransition().onTransition(entity2);
}