Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update upstream

Browse Source
This commit is contained in:
William Blake Galbreath
2019-06-22 16:28:44 -05:00
parent fc12dcbe30
commit f870db0c13
4 changed files with 11 additions and 11 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 c77a444353bc88dd1a663530a3ac4e718eff6aef Mon Sep 17 00:00:00 2001
From 1a31c3947216fa6cfe3893f00c5783e88b69e5fd 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 135ec94c6..a07785941 100644
index 135ec94c6f..a077859418 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -446,13 +446,13 @@ public class WorldServer extends World {
@@ -46,7 +46,7 @@ index 135ec94c6..a07785941 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a649a4c35..92eeaca42 100644
index a649a4c359..92eeaca428 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 a649a4c35..92eeaca42 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 53d4f46d4..3a833868c 100644
index 9bb1ad077a..c404c7ff44 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2155,6 +2155,24 @@ public class CraftWorld implements World {
@@ -2174,6 +2174,24 @@ public class CraftWorld implements World {
}
// Paper end