mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 09:57:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly Paper Changes: 7e8ae207 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 71b9cf6b4317a2d340e1a23eb4bc7fb5fcd3262b Mon Sep 17 00:00:00 2001
|
||||
From 6126176f12b4e60b90fbf20a0e531a00f539dbf0 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
|
||||
@@ -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 a649a4c35..92eeaca42 100644
|
||||
index 9dfba251e..775d40ab1 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 3e55033d3..748b817e9 100644
|
||||
index ece1a68c1..85b5c2bff 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
@@ -2210,6 +2210,24 @@ public class CraftWorld implements World {
|
||||
@@ -2296,6 +2296,24 @@ public class CraftWorld implements World {
|
||||
}
|
||||
// Paper end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user