mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-22 19:07:44 +01:00
Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly Paper Changes: de5b093c Handle chunk unloading during block tick be7b4063 performance: Improve Activation Range entity iteration bacbd880 performance: Many Entity Activation Range Improvements 269394fe Update hidden-configs
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 851975d35eac271f0640df0694048bbfbb8480cb Mon Sep 17 00:00:00 2001
|
||||
From 171bfb411b7bef7d0f541501f8f68edab276c0bb 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] Climbing should not bypass cramming gamerule
|
||||
@@ -17,10 +17,10 @@ Subject: [PATCH] Climbing 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 c0750a632..e2df2adec 100644
|
||||
index 39d84296f..b1bae6a1a 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -1512,6 +1512,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
@@ -1513,6 +1513,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
}
|
||||
|
||||
public boolean isCollidable() {
|
||||
@@ -86,7 +86,7 @@ index e7ba83f32..55e18e4c7 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index e85a7526a..9f2b10073 100644
|
||||
index a6af6695f..f78c6787e 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 {
|
||||
|
||||
Reference in New Issue
Block a user