Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27: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:
767ac20c Merge pull request #2174 from kickash32/Only-count-Natural-Spawned-mobs
fa726c3f Create 0402-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
97488cca Merge pull request #2296 from Spottedleaf/fix-loadchunk-again
36c48316 Fix loadChunk(x, z, false)
This commit is contained in:
William Blake Galbreath
2019-07-13 16:23:55 -05:00
parent cf20351eaa
commit 5cbe985984
6 changed files with 42 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0030-Block-and-Fluid-Tick-Events.patch
View File

@@ -1,4 +1,4 @@
From 6126176f12b4e60b90fbf20a0e531a00f539dbf0 Mon Sep 17 00:00:00 2001
From bac1c8ce3da3e46925a266eca6be5b9c9c7e8b66 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 23:23:52 -0500
Subject: [PATCH] Block and Fluid Tick Events
@@ -10,7 +10,7 @@ Subject: [PATCH] Block and Fluid Tick Events
3 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index c646393eb..9fbfdb803 100644
index 959fc99bb8..95d5cd1c66 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -447,13 +447,13 @@ public class WorldServer extends World {
@@ -46,7 +46,7 @@ index c646393eb..9fbfdb803 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9dfba251e..775d40ab1 100644
index 9dfba251ea..775d40ab1b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -106,4 +106,11 @@ public class PurpurWorldConfig {
@@ -62,10 +62,10 @@ index 9dfba251e..775d40ab1 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index ece1a68c1..85b5c2bff 100644
index f01e8a87e8..c5321c5076 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2296,6 +2296,24 @@ public class CraftWorld implements World {
@@ -2336,6 +2336,24 @@ public class CraftWorld implements World {
}
// Paper end