Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17: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:
42daaadd Seperate out incremental saving
3a713bd5 Mark entities as being ticked when notifying navigation
6f709200 use getChunkImmediately for vehicles
This commit is contained in:
William Blake Galbreath
2019-07-27 21:46:21 -05:00
parent fecf837b13
commit 6fb364e8e0
4 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 01d5f91c38f2f0136371f0a6bfc024c70c594809 Mon Sep 17 00:00:00 2001
From 13cceab96a020767c5cbc232a147d50faa77610e 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
@@ -29,10 +29,10 @@ index 318a470eea..72b77e27e8 100644
private void countAllMobsForSpawning() {
countAllMobsForSpawning = getBoolean("count-all-mobs-for-spawning", false);
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index ed0ff8573b..b3936caf45 100644
index b1bea8f90d..d92446d79b 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -592,9 +592,21 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -601,9 +601,21 @@ public class ChunkProviderServer extends IChunkProvider {
// Paper start - only allow spawns upto the limit per chunk and update count afterwards
int currEntityCount = object2intmap.getInt(enumcreaturetype);
int difference = k1 - currEntityCount;
@@ -69,7 +69,7 @@ index d92fbea4c7..f9bc2ab66e 100644
return this.ba;
}
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index 7d2808aa29..c2c4224385 100644
index 4c774e31dc..ebf0298631 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -137,6 +137,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -80,7 +80,7 @@ index 7d2808aa29..c2c4224385 100644
private static double a(ChunkCoordIntPair chunkcoordintpair, Entity entity) {
double d0 = (double) (chunkcoordintpair.x * 16 + 8);
double d1 = (double) (chunkcoordintpair.z * 16 + 8);
@@ -1327,8 +1328,8 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -1340,8 +1341,8 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
}
@@ -163,7 +163,7 @@ index 925efd4a15..70580355c6 100644
@Nullable
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index c039d4f884..1331baf584 100644
index ba4f7999f9..38768a5002 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 {
@@ -174,7 +174,7 @@ index c039d4f884..1331baf584 100644
// CraftBukkit start
private int tickPosition;
@@ -937,6 +938,7 @@ public class WorldServer extends World {
@@ -966,6 +967,7 @@ public class WorldServer extends World {
}
public Object2IntMap<EnumCreatureType> l() {
@@ -182,7 +182,7 @@ index c039d4f884..1331baf584 100644
Object2IntMap<EnumCreatureType> object2intmap = new Object2IntOpenHashMap();
ObjectIterator objectiterator = this.entitiesById.values().iterator();
@@ -961,14 +963,48 @@ public class WorldServer extends World {
@@ -990,14 +992,48 @@ public class WorldServer extends World {
entity.spawnReason == CreatureSpawnEvent.SpawnReason.CHUNK_GEN)) {
continue;
}