aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0072-Add-World-Util-Methods.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0072-Add-World-Util-Methods.patch')
-rw-r--r--patches/server/0072-Add-World-Util-Methods.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/patches/server/0072-Add-World-Util-Methods.patch b/patches/server/0072-Add-World-Util-Methods.patch
new file mode 100644
index 0000000000..163fce5769
--- /dev/null
+++ b/patches/server/0072-Add-World-Util-Methods.patch
@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+Date: Fri, 18 Mar 2016 20:16:03 -0400
+Subject: [PATCH] Add World Util Methods
+
+Methods that can be used for other patches to help improve logic.
+
+diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
+index 4f5ff6849e0ea7a4f2491e0dbede7699554239dc..eae1d6eedeed09b3f49913c2bb205b80442bbfe3 100644
+--- a/src/main/java/net/minecraft/world/level/Level.java
++++ b/src/main/java/net/minecraft/world/level/Level.java
+@@ -341,6 +341,22 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+ return chunk == null ? null : chunk.getFluidState(blockposition);
+ }
+
++ public final boolean isLoadedAndInBounds(BlockPos blockposition) { // Paper - final for inline
++ return getWorldBorder().isWithinBounds(blockposition) && getChunkIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4) != null;
++ }
++
++ public @Nullable LevelChunk getChunkIfLoaded(int x, int z) { // Overridden in WorldServer for ABI compat which has final
++ return ((ServerLevel) this).getChunkSource().getChunkAtIfLoadedImmediately(x, z);
++ }
++ public final @Nullable LevelChunk getChunkIfLoaded(BlockPos blockposition) {
++ return ((ServerLevel) this).getChunkSource().getChunkAtIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4);
++ }
++
++ // reduces need to do isLoaded before getType
++ public final @Nullable BlockState getBlockStateIfLoadedAndInBounds(BlockPos blockposition) {
++ return getWorldBorder().isWithinBounds(blockposition) ? getBlockStateIfLoaded(blockposition) : null;
++ }
++
+ @Override
+ public final ChunkAccess getChunk(int chunkX, int chunkZ, ChunkStatus leastStatus, boolean create) { // Paper - final for inline
+ // Paper end