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:
453c7f05c Add ItemStack#displayName to get the formatted display name of an ItemStack (#5628)
4efe8b498 Update Java version warning (#5621)
e0a021ccc Add ItemStack#getTranslationKey() (#5616)
53d71b717 Add setPotionUseTimeLeft to Witch (#5597)
239935d18 Add Inventory#close (#5610)
29bf6cd41 Updated Upstream (CraftBukkit)
ad45f316c Add raw address to AsyncPlayerPreLoginEvent (#5614)
28865335a [Auto] Updated Upstream (CraftBukkit)
This commit is contained in:
BillyGalbreath
2021-05-13 14:58:16 -05:00
parent beed258ee9
commit 2d4611b790
32 changed files with 69 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15008,7 +15008,7 @@ index 7e032845fe9a46d33236444d62405a41e29daa17..a8a2c29874e95dc08b85eb41882fc947
this.tickingEntities = wasTicking; // Paper
}
diff --git a/src/main/java/net/minecraft/server/network/LoginListener.java b/src/main/java/net/minecraft/server/network/LoginListener.java
index c67b94840e4c967baebf6eb351df15f0e4ead4be..ed836462123efc6903e406fa926e55e1cedddb95 100644
index f54af7cabc6b4e062948dc97e577e7fe04b5add4..4e28b58731c7e76a727ed8f0967150f8fe22ab66 100644
--- a/src/main/java/net/minecraft/server/network/LoginListener.java
+++ b/src/main/java/net/minecraft/server/network/LoginListener.java
@@ -256,7 +256,7 @@ public class LoginListener implements PacketLoginInListener {
@@ -20663,7 +20663,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 1a0b3e2313b87c6a5eb049838ec72304dcc8f543..ce2fb6288edb871414c44d003ac63ff4045a820a 100644
index 6cc8eb04f42592aa12f76bb4a0a863ea509741b2..55f2834373ccc7362836b4fab4ae2f069f31fd63 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
@@ -20691,7 +20691,7 @@ index 1a0b3e2313b87c6a5eb049838ec72304dcc8f543..ce2fb6288edb871414c44d003ac63ff4
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -1909,7 +1911,10 @@ public final class CraftServer implements Server {
@@ -1917,7 +1919,10 @@ public final class CraftServer implements Server {
@Override
public boolean isPrimaryThread() {
@@ -20703,7 +20703,7 @@ index 1a0b3e2313b87c6a5eb049838ec72304dcc8f543..ce2fb6288edb871414c44d003ac63ff4
}
// Paper start
@@ -2343,6 +2348,14 @@ public final class CraftServer implements Server {
@@ -2351,6 +2356,14 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.config;
}