Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
fe7ef7b5 Do not schedule to main for getChunkImmediately type calls (#2362)
This commit is contained in:
William Blake Galbreath
2019-07-25 20:41:56 -05:00
parent d78b851972
commit 694d9f8e15
5 changed files with 12 additions and 12 deletions

View File

@@ -1,4 +1,4 @@
From c8a1368c07cb0ba0bfe9c44c7ddb36cf8c2b354d Mon Sep 17 00:00:00 2001
From 7b879f573461472f310216d5c2e133462d71506f 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 ab87387573..f2c13a07bd 100644
index ed0ff8573b..882e1d007c 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -628,9 +628,21 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -592,9 +592,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;