Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation issues (#1509)

Browse Source
This commit is contained in:
Krakenied
2024-04-28 22:23:25 +02:00
committed by GitHub
parent 9d2dae3c9c
commit dc9993f4d1
36 changed files with 207 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0257-Remove-Mojang-Profiler.patch
View File

@@ -826,10 +826,10 @@ index a84a9218838fb42c49a00c0d5f28e9e486fc7dac..f72af2feb74626abbdfbfd090c153574
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 85f58f5449ee63a7f592971769b497e521921fcc..054a8aff30181d1a568ad931eb150fc2992cac97 100644
index 4c603f774931b9d144420a115ad324bcb2eae26e..93aac363b21d695f266c66ec58f4ac8d17d61611 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1318,7 +1318,7 @@ public class ServerPlayer extends Player {
@@ -1317,7 +1317,7 @@ public class ServerPlayer extends Player {
PortalInfo shapedetectorshape = this.findDimensionEntryPoint(worldserver);
if (shapedetectorshape != null) {
@@ -838,7 +838,7 @@ index 85f58f5449ee63a7f592971769b497e521921fcc..054a8aff30181d1a568ad931eb150fc2
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
@@ -1341,8 +1341,8 @@ public class ServerPlayer extends Player {
@@ -1340,8 +1340,8 @@ public class ServerPlayer extends Player {
worldserver = ((CraftWorld) exit.getWorld()).getHandle();
// CraftBukkit end
@@ -849,7 +849,7 @@ index 85f58f5449ee63a7f592971769b497e521921fcc..054a8aff30181d1a568ad931eb150fc2
if (true) { // CraftBukkit
this.isChangingDimension = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
@@ -1360,7 +1360,7 @@ public class ServerPlayer extends Player {
@@ -1359,7 +1359,7 @@ public class ServerPlayer extends Player {
this.connection.teleport(exit); // CraftBukkit - use internal teleport without event
this.connection.resetPosition();
worldserver.addDuringPortalTeleport(this);