mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 01:47:42 +01:00
Updated Upstream (Paper & Tuinity)
Upstream has released updates that appears to apply and compile correctly Paper Changes: 4bcebab1 Add getOfflinePlayerIfCached(String) 67c30690 Fix ghost blocks in ticking view distance 8e6d90c2 [CI-SKIP] Add a GitHub Actions job (#4703) 0ac53efb Avoid crashing clients when fishing loot is empty, Fixes #4235 (#4681) b64ee74a Fix armor stands still doing entity collision Tuinity Changes: 576e2cc Rate limit incoming packets
This commit is contained in:
@@ -5,7 +5,7 @@ Subject: [PATCH] Bring back server name
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
|
||||
index 23f8e144f..6797fa2e8 100644
|
||||
index 23f8e144fc..6797fa2e8c 100644
|
||||
--- a/src/main/java/net/minecraft/server/DedicatedServerProperties.java
|
||||
+++ b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
|
||||
@@ -10,6 +10,7 @@ public class DedicatedServerProperties extends PropertyManager<DedicatedServerPr
|
||||
@@ -17,10 +17,10 @@ index 23f8e144f..6797fa2e8 100644
|
||||
public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
|
||||
public final boolean pvp = this.getBoolean("pvp", true);
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 09097ec75..d46f51098 100644
|
||||
index 51ef4ab09e..d61062fa64 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -2415,4 +2415,11 @@ public final class CraftServer implements Server {
|
||||
@@ -2437,4 +2437,11 @@ public final class CraftServer implements Server {
|
||||
return mobGoals;
|
||||
}
|
||||
// Paper end
|
||||
|
||||
Reference in New Issue
Block a user