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:
aa022fda Fix java cross-version compilation
8b7952a9 Implement alternative item-despawn-rate (#2128)
6ccf0bda Reimplement hopper optimization patch (#2388)
e264c365 MC-156852 fix (#2396)
b6c32b2a Fix recursion in EntityFox (#2418)
7c640a1a Updated Upstream (Bukkit/CraftBukkit/Spigot)  (#2415)
This commit is contained in:
William Blake Galbreath
2019-08-08 18:01:13 -05:00
parent 3935d71fba
commit 2f16d3d43e
17 changed files with 87 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
patches/server/0043-Ladders-should-not-bypass-cramming-gamerule.patch
View File

@@ -1,4 +1,4 @@
From 2611b16865eef20db3a3fe08fcd6e7490ac1e892 Mon Sep 17 00:00:00 2001
From a8789afaed676f1623db2623f366ff9c1fd0b1df Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 21 Jul 2019 18:06:20 -0500
Subject: [PATCH] Ladders should not bypass cramming gamerule
@@ -17,7 +17,7 @@ Subject: [PATCH] Ladders should not bypass cramming gamerule
10 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 26a30e1c..770d2146 100644
index 26a30e1c0..770d21468 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1522,6 +1522,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -32,7 +32,7 @@ index 26a30e1c..770d2146 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index e516db27..2fb10f6c 100644
index e516db270..2fb10f6c2 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -316,7 +316,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -45,7 +45,7 @@ index e516db27..2fb10f6c 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java
index 8a8acf14..88b94505 100644
index 8a8acf14a..88b94505c 100644
--- a/src/main/java/net/minecraft/server/EntityBat.java
+++ b/src/main/java/net/minecraft/server/EntityBat.java
@@ -54,7 +54,7 @@ public class EntityBat extends EntityAmbient {
@@ -58,7 +58,7 @@ index 8a8acf14..88b94505 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
index 32b7f780..b5bcd1f8 100644
index 32b7f7805..b5bcd1f80 100644
--- a/src/main/java/net/minecraft/server/EntityBoat.java
+++ b/src/main/java/net/minecraft/server/EntityBoat.java
@@ -98,7 +98,7 @@ public class EntityBoat extends Entity {
@@ -71,7 +71,7 @@ index 32b7f780..b5bcd1f8 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
index 2177a437..05a5169c 100644
index 2177a4370..05a5169c1 100644
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
@@ -165,7 +165,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -84,10 +84,10 @@ index 2177a437..05a5169c 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index aa60c008..14972386 100644
index 89e5d01aa..bc701552e 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2609,7 +2609,7 @@ public abstract class EntityLiving extends Entity {
@@ -2613,7 +2613,7 @@ public abstract class EntityLiving extends Entity {
protected void doTick() {}
protected void collideNearby() {
@@ -96,7 +96,7 @@ index aa60c008..14972386 100644
if (!list.isEmpty()) {
int i = this.world.getGameRules().getInt(GameRules.MAX_ENTITY_CRAMMING);
@@ -2747,8 +2747,10 @@ public abstract class EntityLiving extends Entity {
@@ -2751,8 +2751,10 @@ public abstract class EntityLiving extends Entity {
}
@Override
@@ -110,7 +110,7 @@ index aa60c008..14972386 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
index c5b4057c..d5a28392 100644
index c5b4057c3..d5a28392a 100644
--- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
@@ -82,7 +82,7 @@ public abstract class EntityMinecartAbstract extends Entity {
@@ -123,7 +123,7 @@ index c5b4057c..d5a28392 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
index 0eeb1105..7c2c3119 100644
index 0eeb11055..7c2c3119b 100644
--- a/src/main/java/net/minecraft/server/EntityParrot.java
+++ b/src/main/java/net/minecraft/server/EntityParrot.java
@@ -351,7 +351,7 @@ public class EntityParrot extends EntityPerchable implements EntityBird {
@@ -136,10 +136,10 @@ index 0eeb1105..7c2c3119 100644
}
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index 56488b78..7ef7fe22 100644
index 56739e6ed..0bac6e424 100644
--- a/src/main/java/net/minecraft/server/IEntitySelector.java
+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
@@ -32,11 +32,16 @@ public final class IEntitySelector {
@@ -33,11 +33,16 @@ public final class IEntitySelector {
}
public static Predicate<Entity> a(Entity entity) {
@@ -158,7 +158,7 @@ index 56488b78..7ef7fe22 100644
} else if (entity.world.isClientSide && (!(entity1 instanceof EntityHuman) || !((EntityHuman) entity1).dG())) {
return false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index f8a35064..f589f0e8 100644
index f8a350649..f589f0e8b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -146,6 +146,11 @@ public class PurpurConfig {