Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 02:47: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:
19ff55ef Update upstream B/CB
79710332 Update upstream CB
19de9af6 1.15.2 update (#2887)
d4ae43fc Updated Upstream (Bukkit/CraftBukkit)
9c2d9a5f [CI-SKIP] Rebuild patches
86a4b752 Fix items not falling correctly (Resolves #2835) (#2872)
35472de2 Port activation range improvement patch (#2763)
617f6033 Add effect to block break naturally (#2819)
f63cfe00 Updated Upstream (Bukkit/CraftBukkit)
00860e4e [CI-SKIP] rebuild patches
3d519668 Prevent sync chunk loads when villagers try to find beds (#2855)
This commit is contained in:
William Blake Galbreath
2020-01-21 22:17:22 -06:00
parent ab2c6c147e
commit 8ad9357437
38 changed files with 466 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/server/0040-Ladders-should-not-bypass-cramming-gamerule.patch
View File

@@ -1,4 +1,4 @@
From a4dcd36d98f5f3a00f5201b777478de3bdf990ab Mon Sep 17 00:00:00 2001
From b83d33f69a3f2665db1515cac7a598bf539499cb 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,10 +17,10 @@ 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 36d11cfdf..dee92e5a7 100644
index 5a5531c10..416eb5d77 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1508,6 +1508,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1509,6 +1509,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public boolean isCollidable() {
@@ -32,10 +32,10 @@ index 36d11cfdf..dee92e5a7 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index e6032e3ed..fc4e12d9a 100644
index 8ad131e4f..dfe8c57ce 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -323,7 +323,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -318,7 +318,7 @@ public class EntityArmorStand extends EntityLiving {
}
@Override
@@ -58,7 +58,7 @@ index b19028fa8..56bdaf0e0 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
index 6a1d32df6..03624bbd6 100644
index 399fdf2f0..cb1156901 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 {
@@ -84,10 +84,10 @@ index 5cd46c747..c02d2afbe 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 7a5a1a2d3..758131649 100644
index 38948133e..31cfac0c8 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2673,7 +2673,7 @@ public abstract class EntityLiving extends Entity {
@@ -2675,7 +2675,7 @@ public abstract class EntityLiving extends Entity {
protected void doTick() {}
protected void collideNearby() {
@@ -96,7 +96,7 @@ index 7a5a1a2d3..758131649 100644
if (!list.isEmpty()) {
int i = this.world.getGameRules().getInt(GameRules.MAX_ENTITY_CRAMMING);
@@ -2811,8 +2811,10 @@ public abstract class EntityLiving extends Entity {
@@ -2813,8 +2813,10 @@ public abstract class EntityLiving extends Entity {
}
@Override
@@ -158,7 +158,7 @@ index a2d1ef360..8d7273a38 100644
} else if (entity.world.isClientSide && (!(entity1 instanceof EntityHuman) || !((EntityHuman) entity1).ec())) {
return false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index debf152bc..6c4fafaf7 100644
index 83112e6ec..627177731 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 {
@@ -174,5 +174,5 @@ index debf152bc..6c4fafaf7 100644
private static void fixItemPositionDesync() {
fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync);
--
2.24.0.rc1
2.24.0