Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37: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@b327e17 Fix regenerate chunk method
PaperMC/Paper@22ac7d6 Add internal netty pipeline events
PaperMC/Paper@345a6a6 Updated Upstream (CraftBukkit)
PaperMC/Paper@86f87ba Fix custom merchant trade event world reference
This commit is contained in:
BillyGalbreath
2022-07-27 03:22:54 -05:00
parent a247b93571
commit 85f63e5df0
17 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -802,10 +802,10 @@ index ca733d97929c123df1234143660631eb07d62e79..655b9e8ffb941a0777f3895bf39c38fe
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 60873c874abbeff8f30b3536f5c4cc03e663530a..a8a3de5b23e4e5ce5d7d5bb84d85c3a7d62431ac 100644
index f983d5739b46664f084d14a1b8a0e09efd1df999..73e150bd2a8cce3674887e1e8f8637de71631a53 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1154,7 +1154,7 @@ public class ServerPlayer extends Player {
@@ -1155,7 +1155,7 @@ public class ServerPlayer extends Player {
PortalInfo shapedetectorshape = this.findDimensionEntryPoint(worldserver);
if (shapedetectorshape != null) {
@@ -814,7 +814,7 @@ index 60873c874abbeff8f30b3536f5c4cc03e663530a..a8a3de5b23e4e5ce5d7d5bb84d85c3a7
worldserver = shapedetectorshape.world; // CraftBukkit
if (worldserver == null) { } else // CraftBukkit - empty to fall through to null to event
if (resourcekey == LevelStem.OVERWORLD && worldserver.getTypeKey() == LevelStem.NETHER) { // CraftBukkit
@@ -1177,8 +1177,8 @@ public class ServerPlayer extends Player {
@@ -1178,8 +1178,8 @@ public class ServerPlayer extends Player {
worldserver = ((CraftWorld) exit.getWorld()).getHandle();
// CraftBukkit end
@@ -825,7 +825,7 @@ index 60873c874abbeff8f30b3536f5c4cc03e663530a..a8a3de5b23e4e5ce5d7d5bb84d85c3a7
if (true) { // CraftBukkit
this.isChangingDimension = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
@@ -1196,7 +1196,7 @@ public class ServerPlayer extends Player {
@@ -1197,7 +1197,7 @@ public class ServerPlayer extends Player {
worldserver.addDuringPortalTeleport(this);
this.connection.teleport(exit); // CraftBukkit - use internal teleport without event
this.connection.resetPosition(); // CraftBukkit - sync position after changing it (from PortalTravelAgent#findAndteleport)
@@ -1061,7 +1061,7 @@ index 5725c6593480fada65facc29664a00a8cc073512..ccb1f998ae3122d1856d77149ff7e7df
};
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index ba4ff82c773b5c2ab46af13a467a7b36ba2bf63c..4e456c3c99d5203f48e921c38c38f9c6779581ad 100644
index d05706583404bda548b955d996f38e73a7952776..553154e47a50615109ee70568c38dc1979d9ce98 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -821,7 +821,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {