Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +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@dd11ef8 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11102)
This commit is contained in:
granny
2024-07-18 03:57:34 -07:00
parent 2e39567fa1
commit eadfff73ea
35 changed files with 123 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0111-Implement-TPSBar.patch
View File

@@ -41,10 +41,10 @@ index 04fd1172b47a74b16955cf93fc20f64fd056b16e..34dfcdb3de191c08dffe22f624f4e968
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 01f95dd19ffac68d64a6a800ce8121a704faef0e..f0a08a9a96425cee26775698c5c6fd7db2f7cd2c 100644
index d38a94ad94e09e71200d59e4d6a1d751da020020..53d02ab56e3d3f15147d76861bd498d456f59d13 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -302,6 +302,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -303,6 +303,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
public @Nullable String clientBrandName = null; // Paper - Brand support
public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - Add API for quit reason; there are a lot of changes to do if we change all methods leading to the event
public boolean purpurClient = false; // Purpur
@@ -52,7 +52,7 @@ index 01f95dd19ffac68d64a6a800ce8121a704faef0e..f0a08a9a96425cee26775698c5c6fd7d
// Paper start - rewrite chunk system
private ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
@@ -599,6 +600,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -600,6 +601,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
});
}
@@ -60,7 +60,7 @@ index 01f95dd19ffac68d64a6a800ce8121a704faef0e..f0a08a9a96425cee26775698c5c6fd7d
}
@Override
@@ -675,6 +677,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -676,6 +678,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
});
}
@@ -68,7 +68,7 @@ index 01f95dd19ffac68d64a6a800ce8121a704faef0e..f0a08a9a96425cee26775698c5c6fd7d
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -3063,5 +3066,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -3064,5 +3067,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
this.server.getPlayerList().respawn(this, true, RemovalReason.KILLED, org.bukkit.event.player.PlayerRespawnEvent.RespawnReason.DEATH, to);
}
}