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:
b7dc6fb0 fix double world add bug (#2486)
439131c7 Updated Upstream (Bukkit/CraftBukkit)
14e07afd [CI-SKIP] Fix patch number
fc570959 Improve POI data saving logic (#2475)
5ef93ded Fix #2499 (#2500)
b3aeba41 Update Paperclip, remove gson dependency in paperclip
26f644c5 Fix sign line capping check (#2522)
b2758246 Target more sync loads (#2476)
This commit is contained in:
William Blake Galbreath
2019-09-02 11:53:48 -05:00
parent baaba9c765
commit e56dd358e9
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 5272f3c2ef...b7dc6fb00e

2
current-paper
View File

@@ -1 +1 @@
1.14.4--9fd3e8ffa13129e9a071cc93dee040a762caf1b0
1.14.4--0b217f89dfd37f49233a2f8f3dbc8a548f71e7b4

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

@@ -1,4 +1,4 @@
From bbac8483ad1389af8b43a0f1e82811420f67a86e Mon Sep 17 00:00:00 2001
From 082fffa787f9dc329e20e5161b5710eeb43cb4a6 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
@@ -75,10 +75,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 4ffcb15af..d8bcae0ab 100644
index ee3789b38..2e038eb16 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -527,7 +527,9 @@ public class WorldServer extends World {
@@ -533,7 +533,9 @@ public class WorldServer extends World {
IBlockData iblockdata = chunksection.getType(blockposition2.getX() - j, blockposition2.getY() - j1, blockposition2.getZ() - k);
if (iblockdata.q()) {

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

@@ -1,4 +1,4 @@
From 26a2388efb0c2a1076cbbefea9f82b409f427a4b Mon Sep 17 00:00:00 2001
From b21354a2463378ab72115677283b36ad0c09048a 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
@@ -9,10 +9,10 @@ Subject: [PATCH] Add chance for zombie horse natural spawns
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index d8bcae0ab..a8eeba16c 100644
index 2e038eb16..a63e102d6 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -477,12 +477,18 @@ public class WorldServer extends World {
@@ -483,12 +483,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) {

16
patches/server/0054-Implement-AFK-API.patch
View File

@@ -1,4 +1,4 @@
From 1ca64cf36b3a95c2863c7ed5e6113f50335d6a79 Mon Sep 17 00:00:00 2001
From 5fbe7cc1236187e4d0fcc4c584f35c8c00450091 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 8 Aug 2019 15:29:15 -0500
Subject: [PATCH] Implement AFK API
@@ -17,7 +17,7 @@ Subject: [PATCH] Implement AFK API
10 files changed, 113 insertions(+), 24 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 770d21468..2ff5a12d8 100644
index 468d6cc3e..5377dc158 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1396,6 +1396,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -29,7 +29,7 @@ index 770d21468..2ff5a12d8 100644
double d3 = this.locX - d0;
double d4 = this.locY - d1;
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 82da5bc1b..f45501410 100644
index 8b5ceec8d..361061129 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -86,6 +86,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -170,7 +170,7 @@ index 0bac6e424..df79e4af9 100644
public static Predicate<Entity> a(double d0, double d1, double d2, double d3) {
double d4 = d3 * d3;
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 8aa8a672d..1ecadcebe 100644
index 30595523e..6f584d515 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -274,6 +274,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -205,10 +205,10 @@ index 8aa8a672d..1ecadcebe 100644
if (from.getX() != Double.MAX_VALUE) {
Location oldTo = to.clone();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 7ffcc1f1a..8214be52f 100644
index a63e102d6..b7babc897 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -318,7 +318,7 @@ public class WorldServer extends World {
@@ -324,7 +324,7 @@ public class WorldServer extends World {
}
if (this.C && this.players.stream().noneMatch((entityplayer) -> {
@@ -217,7 +217,7 @@ index 7ffcc1f1a..8214be52f 100644
})) {
this.C = false;
if (this.getGameRules().getBoolean(GameRules.DO_DAYLIGHT_CYCLE)) {
@@ -585,7 +585,7 @@ public class WorldServer extends World {
@@ -591,7 +591,7 @@ public class WorldServer extends World {
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
@@ -227,7 +227,7 @@ index 7ffcc1f1a..8214be52f 100644
} else if (entityplayer.isSleeping()) {
++j;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b1dcb5f8d..f4fc0b014 100644
index 059cf85f4..0764be9d1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,6 +1,7 @@