Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37: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/0003-Bring-back-server-name.patch
View File

@@ -1,4 +1,4 @@
From 96390b05dddd5db2d85fac861f902356ec8f8719 Mon Sep 17 00:00:00 2001
From fab96d6bd565297078a7d3ac53eb3da5a6a1f70d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 26 May 2019 15:19:14 -0500
Subject: [PATCH] Bring back server name
@@ -9,7 +9,7 @@ Subject: [PATCH] Bring back server name
2 files changed, 8 insertions(+)
diff --git a/src/main/java/net/minecraft/server/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
index 0c3ec8357..20c143e31 100644
index 0c3ec83570..20c143e314 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
@@ -21,11 +21,11 @@ index 0c3ec8357..20c143e31 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 4cd0bc64b..c14ca997d 100644
index e2bb7c5b5b..2d152627cd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2165,4 +2165,11 @@ public final class CraftServer implements Server {
return new com.destroystokyo.paper.profile.CraftPlayerProfile(uuid, name);
@@ -2170,4 +2170,11 @@ public final class CraftServer implements Server {
return net.minecraft.server.MinecraftServer.currentTick;
}
// Paper end
+
@@ -37,5 +37,5 @@ index 4cd0bc64b..c14ca997d 100644
+ // Purpur end
}
--
2.20.1
2.24.0.rc1