Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
8d036cea Expose the internal current tick
0c715390 [PATCH] bounding box check for hanging entities (#2664)
527073aa Update config version
0d3b35c3 Rename baby zombie movement config option
This commit is contained in:
William Blake Galbreath
2019-10-31 13:51:33 -05:00
parent da1de4da09
commit dd928e3864
42 changed files with 114 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0044-Implement-lagging-threshold.patch
View File

@@ -1,4 +1,4 @@
From 976e0f922370ffca7ef3a2403b677561f59a5c18 Mon Sep 17 00:00:00 2001
From f91fe361c6bb589031f8760abbb38909ee0b25a9 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 10:07:16 -0500
Subject: [PATCH] Implement lagging threshold
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement lagging threshold
3 files changed, 12 insertions(+)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 1b6a9623c..ab596e74e 100644
index 1b6a9623cf..ab596e74e3 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -175,6 +175,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -30,7 +30,7 @@ index 1b6a9623c..ab596e74e 100644
tickSection = curTime;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index b38de26d6..cdfd39374 100644
index f7e1da705d..48d4f1f5aa 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -136,6 +136,11 @@ public class PurpurConfig {
@@ -46,10 +46,10 @@ index b38de26d6..cdfd39374 100644
private static void disableDropsOnCrammingDeath() {
disableDropsOnCrammingDeath = getBoolean("settings.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c14ca997d..9f11583f0 100644
index 2d152627cd..ec9e770838 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2171,5 +2171,10 @@ public final class CraftServer implements Server {
@@ -2176,5 +2176,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return getProperties().serverName;
}
@@ -61,5 +61,5 @@ index c14ca997d..9f11583f0 100644
// Purpur end
}
--
2.23.0.rc1
2.24.0.rc1