mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 09:27:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly Paper Changes: f6f9157b Don't toString block unless actually showing the message b3f0527a Add Spawn Entity SpawnReason API ec8d7387 MC-183249: Don't generate Carving Masks BitSet unless needed 2d401d2d Improve BlockPosition hashCode/equals 2572bd01 Fix world unload toLowercase - Fixes #3326 dda9680b Optimize brigadier child sorting performance a71a4ec2 Fix CraftServer.unloadWorld Leak
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 008c94f5ef0faf47199d34ebe95cfca35dba957e Mon Sep 17 00:00:00 2001
|
||||
From e40b33149f2d4836c29f4ea74fb64d31ee21a0ba 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..309f5562b 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 0b474f64e..047d48873 100644
|
||||
index c075e9d35..b62cfb9a9 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -2254,6 +2254,11 @@ public final class CraftServer implements Server {
|
||||
@@ -2259,6 +2259,11 @@ public final class CraftServer implements Server {
|
||||
// Paper end
|
||||
|
||||
// Purpur start
|
||||
|
||||
Reference in New Issue
Block a user