Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug with climbing bypass gamerule patch

Browse Source
This commit is contained in:
William Blake Galbreath
2020-06-29 05:39:09 -05:00
parent ead7931e64
commit db7408d9f5
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0089-Climbing-should-not-bypass-cramming-gamerule.patch
View File

@@ -1,4 +1,4 @@
From aab19aea2352bd8dc687ee85f603f67edac0b137 Mon Sep 17 00:00:00 2001 From 8fd73dd12bc7497f5018bc32cf0c0c3c7d3ec03a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 21 Jul 2019 18:06:20 -0500 Date: Sun, 21 Jul 2019 18:06:20 -0500
Subject: [PATCH] Climbing should not bypass cramming gamerule Subject: [PATCH] Climbing should not bypass cramming gamerule
@@ -12,13 +12,13 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
src/main/java/net/minecraft/server/EntityLiving.java | 6 +++--- src/main/java/net/minecraft/server/EntityLiving.java | 6 +++---
.../java/net/minecraft/server/EntityMinecartAbstract.java | 2 +- .../java/net/minecraft/server/EntityMinecartAbstract.java | 2 +-
src/main/java/net/minecraft/server/EntityParrot.java | 4 ++-- src/main/java/net/minecraft/server/EntityParrot.java | 4 ++--
src/main/java/net/minecraft/server/EntityPlayer.java | 2 +- src/main/java/net/minecraft/server/EntityPlayer.java | 4 ++--
src/main/java/net/minecraft/server/IEntitySelector.java | 8 +++++++- src/main/java/net/minecraft/server/IEntitySelector.java | 8 +++++++-
src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 2 ++ src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 2 ++
11 files changed, 26 insertions(+), 12 deletions(-) 11 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index dca384ea2..7f209e26f 100644 index 3061b91ed..6bc5ebc43 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1525,6 +1525,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -1525,6 +1525,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -139,18 +139,20 @@ index 2172fcefb..7afdb3060 100644
@Override @Override
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 9801d87f0..7c666abe3 100644 index 408475299..87a668a85 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java --- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1808,7 +1808,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -1808,8 +1808,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
} }
@Override @Override
- public boolean isCollidable() { - public boolean isCollidable() {
- return !isAfk() && super.isCollidable();
+ public boolean isCollidable(boolean ignoreClimbing) { // Purpur + public boolean isCollidable(boolean ignoreClimbing) { // Purpur
return !isAfk() && super.isCollidable(); + return !isAfk() && super.isCollidable(ignoreClimbing);
} }
// Purpur end // Purpur end
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index 9b4795f3b..192d9798c 100644 index 9b4795f3b..192d9798c 100644
--- a/src/main/java/net/minecraft/server/IEntitySelector.java --- a/src/main/java/net/minecraft/server/IEntitySelector.java