Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37: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:
9205b75c Updated Upstream (CraftBukkit)
c32f8e13 PlayerDeathEvent#shouldDropExperience
05ecc314 Updated Upstream (CraftBukkit)
f8fd607e Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2019-12-23 22:17:27 -06:00
parent 074110faf7
commit ca55ab06f0
9 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0067-Add-block-and-fluid-tick-events.patch
View File

@@ -1,4 +1,4 @@
From f5244669db2e3f7e914008169a3ac0173380ebf5 Mon Sep 17 00:00:00 2001
From 464fb34e27bf195e29a5a33cca4d05e739862e6e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 18 Oct 2019 23:58:56 -0500
Subject: [PATCH] Add block and fluid tick events
@@ -10,10 +10,10 @@ Subject: [PATCH] Add 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 78754c254e..266173096f 100644
index 84c069330..8ae7b7784 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -586,7 +586,7 @@ public class WorldServer extends World {
@@ -595,7 +595,7 @@ public class WorldServer extends World {
gameprofilerfiller.enter("randomTick");
IBlockData iblockdata = chunksection.getType(blockposition2.getX() - j, blockposition2.getY() - j1, blockposition2.getZ() - k);
@@ -22,7 +22,7 @@ index 78754c254e..266173096f 100644
iblockdata.getBlock().randomTick = true; // Paper - fix MC-113809
iblockdata.b(this, blockposition2, this.random);
iblockdata.getBlock().randomTick = false; // Paper - fix MC-113809
@@ -594,7 +594,7 @@ public class WorldServer extends World {
@@ -603,7 +603,7 @@ public class WorldServer extends World {
Fluid fluid = iblockdata.getFluid();
@@ -31,7 +31,7 @@ index 78754c254e..266173096f 100644
fluid.b(this, blockposition2, this.random);
}
@@ -683,6 +683,7 @@ public class WorldServer extends World {
@@ -692,6 +692,7 @@ public class WorldServer extends World {
Fluid fluid = this.getFluid(nextticklistentry.a);
if (fluid.getType() == nextticklistentry.b()) {
@@ -39,7 +39,7 @@ index 78754c254e..266173096f 100644
fluid.a((World) this, nextticklistentry.a);
}
@@ -692,6 +693,7 @@ public class WorldServer extends World {
@@ -701,6 +702,7 @@ public class WorldServer extends World {
IBlockData iblockdata = this.getType(nextticklistentry.a);
if (iblockdata.getBlock() == nextticklistentry.b()) {
@@ -48,7 +48,7 @@ index 78754c254e..266173096f 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f687444604..3ad3415c4a 100644
index f68744460..3ad3415c4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -62,6 +62,13 @@ public class PurpurWorldConfig {
@@ -66,10 +66,10 @@ index f687444604..3ad3415c4a 100644
private void editableSigns() {
editableSigns = getBoolean("editable-signs", editableSigns);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index a974391025..05389f5bbe 100644
index 87395de25..be37281d5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2384,6 +2384,24 @@ public class CraftWorld implements World {
@@ -2392,6 +2392,24 @@ public class CraftWorld implements World {
return persistentRaid.raids.values().stream().map(CraftRaid::new).collect(Collectors.toList());
}
@@ -95,5 +95,5 @@ index a974391025..05389f5bbe 100644
@Override
public CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen) {
--
2.24.0.rc1
2.24.0