Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47: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@d5f1ffc Remove somewhat broken patch
This commit is contained in:
BillyGalbreath
2022-12-19 11:11:49 -06:00
parent e2365fa207
commit 4a580c4122
39 changed files with 181 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0121-Implement-TPSBar.patch
View File

@@ -43,10 +43,10 @@ index 44be589011acb90c0d662cb1eb2697cfefd7fba5..f0d4e4e98148fabeb90ae6a22855ed0c
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index ff05549415c46e1d30d3e2c8fc24c2d03038687f..2e9dcb9e4667ef51594508bebabc413edbe41a15 100644
index d0a76519d85d4c9e4dc0b98d038a4c447ce5e833..62fa71b3f9fe488c3b7d44d5c294894744317b96 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -272,6 +272,7 @@ public class ServerPlayer extends Player {
@@ -270,6 +270,7 @@ public class ServerPlayer extends Player {
public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event
public boolean purpurClient = false; // Purpur
public boolean acceptingResourcePack = false; // Purpur
@@ -54,7 +54,7 @@ index ff05549415c46e1d30d3e2c8fc24c2d03038687f..2e9dcb9e4667ef51594508bebabc413e
public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
@@ -511,6 +512,7 @@ public class ServerPlayer extends Player {
@@ -509,6 +510,7 @@ public class ServerPlayer extends Player {
}
}
@@ -62,7 +62,7 @@ index ff05549415c46e1d30d3e2c8fc24c2d03038687f..2e9dcb9e4667ef51594508bebabc413e
}
@Override
@@ -577,6 +579,7 @@ public class ServerPlayer extends Player {
@@ -575,6 +577,7 @@ public class ServerPlayer extends Player {
}
this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
@@ -70,7 +70,7 @@ index ff05549415c46e1d30d3e2c8fc24c2d03038687f..2e9dcb9e4667ef51594508bebabc413e
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2684,5 +2687,13 @@ public class ServerPlayer extends Player {
@@ -2682,5 +2685,13 @@ public class ServerPlayer extends Player {
this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck);
}
}
@@ -85,10 +85,10 @@ index ff05549415c46e1d30d3e2c8fc24c2d03038687f..2e9dcb9e4667ef51594508bebabc413e
// Purpur end
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 3c5529f965a7b069d13b5a10784452159885bb3b..cf72427cf13a23f76b812657abbfa6243ae13a82 100644
index 4769512fe2ca9f6704a3bd2e6dfebdecd46f698d..79578c45c23048de0fbc1d0f09efb7b39629799d 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -511,6 +511,7 @@ public abstract class PlayerList {
@@ -449,6 +449,7 @@ public abstract class PlayerList {
scoreboard.addPlayerToTeam(player.getScoreboardName(), collideRuleTeam);
}
// Paper end
@@ -96,7 +96,7 @@ index 3c5529f965a7b069d13b5a10784452159885bb3b..cf72427cf13a23f76b812657abbfa624
// CraftBukkit - Moved from above, added world
PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", player.getName().getString(), s1, player.getId(), worldserver1.serverLevelData.getLevelName(), player.getX(), player.getY(), player.getZ());
}
@@ -621,6 +622,8 @@ public abstract class PlayerList {
@@ -558,6 +559,8 @@ public abstract class PlayerList {
}
public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer, net.kyori.adventure.text.Component leaveMessage) {
// Paper end