Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27:43 +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:
aa022fda Fix java cross-version compilation
8b7952a9 Implement alternative item-despawn-rate (#2128)
6ccf0bda Reimplement hopper optimization patch (#2388)
e264c365 MC-156852 fix (#2396)
b6c32b2a Fix recursion in EntityFox (#2418)
7c640a1a Updated Upstream (Bukkit/CraftBukkit/Spigot)  (#2415)
This commit is contained in:
William Blake Galbreath
2019-08-08 18:01:13 -05:00
parent 3935d71fba
commit 2f16d3d43e
17 changed files with 87 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0003-Bring-back-server-name.patch
View File

@@ -1,4 +1,4 @@
From f25d39f60c6353f670d087988bf56488e86597a3 Mon Sep 17 00:00:00 2001
From 96390b05dddd5db2d85fac861f902356ec8f8719 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
@@ -21,10 +21,10 @@ 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 3fea9de67..34a6d26a2 100644
index 4cd0bc64b..c14ca997d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2164,4 +2164,11 @@ public final class CraftServer implements Server {
@@ -2165,4 +2165,11 @@ public final class CraftServer implements Server {
return new com.destroystokyo.paper.profile.CraftPlayerProfile(uuid, name);
}
// Paper end