mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-22 02:47:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly Paper Changes: ec9fa369 1.15.2 - Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 8ae63e002d53063369985ba2da34b6a6723b13eb Mon Sep 17 00:00:00 2001
|
||||
From f725aa440b07c03d51e5931eecc2f2b2d740d2a1 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
|
||||
@@ -86,7 +86,7 @@ index f31cb0554..0ecdea671 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index 677c2dc4f..288942e9d 100644
|
||||
index 94be35603..2d0ccff03 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -2694,7 +2694,7 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -98,7 +98,7 @@ index 677c2dc4f..288942e9d 100644
|
||||
try {
|
||||
// Tuinity end - reduce memory allocation from collideNearby
|
||||
|
||||
@@ -2837,8 +2837,10 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -2838,8 +2838,10 @@ public abstract class EntityLiving extends Entity {
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user