aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0885-Don-t-load-chunks-for-supporting-block-checks.patch
diff options
context:
space:
mode:
authorNassim Jahnke <[email protected]>2024-02-23 14:37:33 +0100
committerGitHub <[email protected]>2024-02-23 14:37:33 +0100
commit71c84c8132a463ca26978b852bbbf33ae42cd4ce (patch)
treebbdde5e8056d16ba6778e56165db39b1f6d44468 /patches/server/0885-Don-t-load-chunks-for-supporting-block-checks.patch
parent3ea95efdebba7254e842dec66214f71de4721993 (diff)
downloadPaper-71c84c8132a463ca26978b852bbbf33ae42cd4ce.tar.gz
Paper-71c84c8132a463ca26978b852bbbf33ae42cd4ce.zip
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent 258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD CraftBukkit Changes: 98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent 5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class 76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor Spigot Changes: e9ec5485 Rebuild patches f1b62e0c Rebuild patches
Diffstat (limited to 'patches/server/0885-Don-t-load-chunks-for-supporting-block-checks.patch')
-rw-r--r--patches/server/0885-Don-t-load-chunks-for-supporting-block-checks.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0885-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0885-Don-t-load-chunks-for-supporting-block-checks.patch
index d03e7a3c1e..f1dd778224 100644
--- a/patches/server/0885-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0885-Don-t-load-chunks-for-supporting-block-checks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Don't load chunks for supporting block checks
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0bc310f8edb886c84aa71a7502e297127647cbe5..4aeedd106ccf56e3088f7991f792dec7c4bd357a 100644
+index 5b612466db7c063bf0efbdaa3fcc575eb202ab21..957165e1fce7ddd4c7b7e53a4db8f65739c0ff7f 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1187,7 +1187,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1200,7 +1200,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
}
protected BlockPos getOnPos(float offset) {