Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17: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:
21fbc3196 [CI-SKIP] Add Other textarea to issue templates (#5562)
453e983e4 fix isProxyOnlineMode coverage, don't lookup UUIDs in offline mode (Fixes #2011)
81cc4f928 Send empty commands if tab completion is disabled (Closes #5519)
9ed3e470d Keep moveToWorld with old method signature
This commit is contained in:
BillyGalbreath
2021-05-05 02:13:22 -05:00
parent 5bc5dfdf4f
commit ebc07658d1
16 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/server/0001-Tuinity-Server-Changes.patch
View File

@@ -15270,7 +15270,7 @@ index 69fc2789df88344587b6052f93661ed38f24a503..92836f1200461ba7fff2f8bcb5e1755e
protected void initChannel(Channel channel) throws Exception {
try {
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 6bfa8020c19721dd63e038e4b866a7d3a24e66ac..b5043eabe63fe703a321cff6c0f6449cf729cd0e 100644
index aaa6f3aeaf1b47275a1c8fc22ee99475e62c32a0..76ba1e038fb68eafa2c2039fa1cdd74d060dcf9f 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -179,6 +179,7 @@ public abstract class PlayerList {
@@ -15299,7 +15299,7 @@ index 6bfa8020c19721dd63e038e4b866a7d3a24e66ac..b5043eabe63fe703a321cff6c0f6449c
Player player = entity.getBukkitEntity();
PlayerLoginEvent event = new PlayerLoginEvent(player, hostname, ((java.net.InetSocketAddress) socketaddress).getAddress(), ((java.net.InetSocketAddress) loginlistener.networkManager.getRawAddress()).getAddress());
@@ -945,13 +946,13 @@ public abstract class PlayerList {
@@ -951,13 +952,13 @@ public abstract class PlayerList {
worldserver1.getChunkProvider().addTicket(TicketType.POST_TELEPORT, new ChunkCoordIntPair(location.getBlockX() >> 4, location.getBlockZ() >> 4), 1, entityplayer.getId()); // Paper
entityplayer1.forceCheckHighPriority(); // Player
@@ -15315,7 +15315,7 @@ index 6bfa8020c19721dd63e038e4b866a7d3a24e66ac..b5043eabe63fe703a321cff6c0f6449c
entityplayer1.spawnIn(worldserver1);
entityplayer1.dead = false;
entityplayer1.playerConnection.teleport(new Location(worldserver1.getWorld(), entityplayer1.locX(), entityplayer1.locY(), entityplayer1.locZ(), entityplayer1.yaw, entityplayer1.pitch));
@@ -1220,7 +1221,7 @@ public abstract class PlayerList {
@@ -1226,7 +1227,7 @@ public abstract class PlayerList {
// Really shouldn't happen...
backingSet = world != null ? world.players.toArray() : players.toArray();
} else {
@@ -15325,7 +15325,7 @@ index 6bfa8020c19721dd63e038e4b866a7d3a24e66ac..b5043eabe63fe703a321cff6c0f6449c
return;
}
diff --git a/src/main/java/net/minecraft/server/players/UserCache.java b/src/main/java/net/minecraft/server/players/UserCache.java
index e813d4dd1a46734d16b42905808caa889811afcc..ee5c038c4ede294ec5b9b9b9f705ba46b6c7ac8c 100644
index c617b7dd5a992770fc87113987807947ae68be81..7ce5bd130441a3bc32ee5fa3630edce23dadd0b8 100644
--- a/src/main/java/net/minecraft/server/players/UserCache.java
+++ b/src/main/java/net/minecraft/server/players/UserCache.java
@@ -52,6 +52,11 @@ public class UserCache {
@@ -15356,7 +15356,7 @@ index e813d4dd1a46734d16b42905808caa889811afcc..ee5c038c4ede294ec5b9b9b9f705ba46
}
@@ -110,7 +117,7 @@ public class UserCache {
@@ -111,7 +118,7 @@ public class UserCache {
}
public void saveProfile(GameProfile gameprofile) { a(gameprofile); } // Paper - OBFHELPER
@@ -15365,7 +15365,7 @@ index e813d4dd1a46734d16b42905808caa889811afcc..ee5c038c4ede294ec5b9b9b9f705ba46
Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date());
@@ -127,8 +134,9 @@ public class UserCache {
@@ -128,8 +135,9 @@ public class UserCache {
}
@Nullable
@@ -15376,7 +15376,7 @@ index e813d4dd1a46734d16b42905808caa889811afcc..ee5c038c4ede294ec5b9b9b9f705ba46
UserCache.UserCacheEntry usercache_usercacheentry = (UserCache.UserCacheEntry) this.c.get(s1);
boolean flag = false;
@@ -142,10 +150,14 @@ public class UserCache {
@@ -143,10 +151,14 @@ public class UserCache {
GameProfile gameprofile;
if (usercache_usercacheentry != null) {
@@ -15391,7 +15391,7 @@ index e813d4dd1a46734d16b42905808caa889811afcc..ee5c038c4ede294ec5b9b9b9f705ba46
if (gameprofile != null) {
this.a(gameprofile);
flag = false;
@@ -157,6 +169,7 @@ public class UserCache {
@@ -158,6 +170,7 @@ public class UserCache {
}
return gameprofile;
@@ -15399,7 +15399,7 @@ index e813d4dd1a46734d16b42905808caa889811afcc..ee5c038c4ede294ec5b9b9b9f705ba46
}
// Paper start
@@ -291,7 +304,9 @@ public class UserCache {
@@ -292,7 +305,9 @@ public class UserCache {
}
private Stream<UserCache.UserCacheEntry> a(int i) {
@@ -20820,7 +20820,7 @@ index e50731723d266ba65b2163df2e935afb8b013a93..a6736d15282715d920bab85eb92074cd
}
value.append("},");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 03b8d67a5f0088c0254b2099f27e8dcae32a6221..fd3333fef4112e6469ccd316ba2c82926c04e5db 100644
index 1a0b3e2313b87c6a5eb049838ec72304dcc8f543..ce2fb6288edb871414c44d003ac63ff4045a820a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -232,7 +232,7 @@ import javax.annotation.Nullable; // Paper
@@ -20848,7 +20848,7 @@ index 03b8d67a5f0088c0254b2099f27e8dcae32a6221..fd3333fef4112e6469ccd316ba2c8292
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -1910,7 +1912,10 @@ public final class CraftServer implements Server {
@@ -1909,7 +1911,10 @@ public final class CraftServer implements Server {
@Override
public boolean isPrimaryThread() {
@@ -20860,7 +20860,7 @@ index 03b8d67a5f0088c0254b2099f27e8dcae32a6221..fd3333fef4112e6469ccd316ba2c8292
}
// Paper start
@@ -2344,6 +2349,14 @@ public final class CraftServer implements Server {
@@ -2343,6 +2348,14 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.config;
}