Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +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:
ef7202b9 Fix entity count in timings graph (#2293)
This commit is contained in:
William Blake Galbreath
2019-07-08 20:47:08 -05:00
parent 996eda8590
commit fa9519d224
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 0a8afdacb6...ef7202b9c2

2
current-paper
View File

@@ -1 +1 @@
1.14.3--c29eac1ff5b55076cad45eba5b07a6963269d4ff
1.14.3--4c1649da0b697c9076f3809c18867830e4490744

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

@@ -1,4 +1,4 @@
From c84db70f17617685b8f4386188ed65a63f96894e Mon Sep 17 00:00:00 2001
From 71b9cf6b4317a2d340e1a23eb4bc7fb5fcd3262b 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,10 +10,10 @@ 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 ec3b6ec5cf..3b6b9b108c 100644
index c646393eb..9fbfdb803 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 {
@@ -447,13 +447,13 @@ public class WorldServer extends World {
gameprofilerfiller.enter("randomTick");
IBlockData iblockdata = chunksection.getType(blockposition2.getX() - j, blockposition2.getY() - j1, blockposition2.getZ() - k);
@@ -29,7 +29,7 @@ index ec3b6ec5cf..3b6b9b108c 100644
fluid.b(this, blockposition2, this.random);
}
@@ -541,6 +541,7 @@ public class WorldServer extends World {
@@ -542,6 +542,7 @@ public class WorldServer extends World {
Fluid fluid = this.getFluid(nextticklistentry.a);
if (fluid.getType() == nextticklistentry.b()) {
@@ -37,7 +37,7 @@ index ec3b6ec5cf..3b6b9b108c 100644
fluid.a((World) this, nextticklistentry.a);
}
@@ -550,6 +551,7 @@ public class WorldServer extends World {
@@ -551,6 +552,7 @@ public class WorldServer extends World {
IBlockData iblockdata = this.getType(nextticklistentry.a);
if (iblockdata.getBlock() == nextticklistentry.b()) {
@@ -46,7 +46,7 @@ index ec3b6ec5cf..3b6b9b108c 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a649a4c359..92eeaca428 100644
index a649a4c35..92eeaca42 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,7 +62,7 @@ index a649a4c359..92eeaca428 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 3e55033d3c..748b817e90 100644
index 3e55033d3..748b817e9 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 {

6
patches/server/0044-Fix-MC-113809-Only-grow-cactus-reeds-bamboo-chorus-f.patch
View File

@@ -1,4 +1,4 @@
From 607c4871b41a74370a1f377aa110d475e445737a Mon Sep 17 00:00:00 2001
From 14964e75cedac920eadee6e16b8e0fc511509220 Mon Sep 17 00:00:00 2001
From: Phoenix616 <mail@moep.tv>
Date: Thu, 16 May 2019 01:33:46 +0100
Subject: [PATCH] Fix MC-113809 Only grow cactus/reeds/bamboo/chorus fruit on
@@ -74,10 +74,10 @@ index ff674a9d5..4a13e248e 100644
for (i = 1; world.getType(blockposition.down(i)).getBlock() == this; ++i) {
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 548e4e02d..17c8f9ff8 100644
index 9fbfdb803..489fb57dc 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -447,7 +447,9 @@ public class WorldServer extends World {
@@ -448,7 +448,9 @@ public class WorldServer extends World {
IBlockData iblockdata = chunksection.getType(blockposition2.getX() - j, blockposition2.getY() - j1, blockposition2.getZ() - k);
if (iblockdata.q()&& (!purpurConfig.blockTickEvent || new net.pl3x.purpur.event.block.BlockTickEvent(getWorld(), blockposition2.x, blockposition2.y, blockposition2.z, true).callEvent())) { // Purpur

6
patches/server/0046-Add-chance-for-zombie-horse-natural-spawns.patch
View File

@@ -1,4 +1,4 @@
From 5be3222e57272e30387b6f54f942229c9bddf0bc Mon Sep 17 00:00:00 2001
From 10fdd39e9046b121727f0a788295be39ad413fdd Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 7 Jul 2019 19:52:16 -0500
Subject: [PATCH] Add chance for zombie horse natural spawns
@@ -8,10 +8,10 @@ Subject: [PATCH] Add chance for zombie horse natural spawns
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 17c8f9ff8..bb9860ecc 100644
index 489fb57dc..b5c902e1d 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -397,12 +397,18 @@ public class WorldServer extends World {
@@ -398,12 +398,18 @@ public class WorldServer extends World {
boolean flag1 = this.getGameRules().getBoolean(GameRules.DO_MOB_SPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.b() * paperConfig.skeleHorseSpawnChance; // Paper
if (flag1) {