Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +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:
c4ae0002 Fix some API and commands usage of inactive chunks (#2457)
700a6649 Print entity debug stacktrace on entity double add (#2438)
9d6680ee Fix MC-158900 (#2458)
928abb41 [CI-SKIP] Rebuild patches for last merge
34e64781 Do less work if we have a custom Bukkit generator (#2318)
This commit is contained in:
William Blake Galbreath
2019-08-15 12:55:24 -05:00
parent e9d374a46c
commit 87eeb03354
6 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0054-implement-optional-per-player-mob-spawns.patch
View File

@@ -1,4 +1,4 @@
From 88eefa693e3cd107d509050841e1a2d478e9b837 Mon Sep 17 00:00:00 2001
From a588cde615cc358ee14a68296bd46ff6d278deed Mon Sep 17 00:00:00 2001
From: kickash32 <kickash32@gmail.com>
Date: Tue, 11 Jun 2019 22:22:16 -0400
Subject: [PATCH] implement optional per player mob spawns
@@ -225,7 +225,7 @@ index 62fc61df2..b2a1999bb 100644
@Nullable
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 787dc3e88..50fcab233 100644
index 0e23eeb1f..0bbd28ed8 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -70,6 +70,7 @@ public class WorldServer extends World {
@@ -236,7 +236,7 @@ index 787dc3e88..50fcab233 100644
// CraftBukkit start
private int tickPosition;
@@ -964,6 +965,16 @@ public class WorldServer extends World {
@@ -966,6 +967,16 @@ public class WorldServer extends World {
}
public Object2IntMap<EnumCreatureType> l() {
@@ -253,7 +253,7 @@ index 787dc3e88..50fcab233 100644
Object2IntMap<EnumCreatureType> object2intmap = new Object2IntOpenHashMap();
ObjectIterator objectiterator = this.entitiesById.values().iterator();
@@ -988,6 +999,7 @@ public class WorldServer extends World {
@@ -990,6 +1001,7 @@ public class WorldServer extends World {
entity.spawnReason == CreatureSpawnEvent.SpawnReason.CHUNK_GEN)) {
continue;
}
@@ -261,7 +261,7 @@ index 787dc3e88..50fcab233 100644
// Paper end
object2intmap.mergeInt(enumcreaturetype, 1, Integer::sum);
}
@@ -996,6 +1008,20 @@ public class WorldServer extends World {
@@ -998,6 +1010,20 @@ public class WorldServer extends World {
return object2intmap;
}
@@ -283,5 +283,5 @@ index 787dc3e88..50fcab233 100644
public boolean addEntity(Entity entity) {
// CraftBukkit start
--
2.20.1
2.23.0.rc1