SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move getTypeIfLoaded and friends to IBlockAccess (#2077)

Browse Source
This commit is contained in:
Spottedleaf
2019-05-26 23:14:14 -07:00
parent 4a65bd4b04
commit 78a4e64734
38 changed files with 312 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Spigot-Server-Patches/Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
View File

@@ -73,25 +73,4 @@ index b286934aa8..c7e25e2be8 100644
+ return fluid != null && fluid.a(TagsFluid.WATER); // Paper
}
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 8bb2e1bf0f..5220ea0994 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
return chunk.getType(blockposition);
}
}
+ // Paper start
+ public Fluid getFluidIfLoaded(BlockPosition blockposition) {
+ if (blockposition.isInvalidYLocation()) { // Paper
+ return getFluid(blockposition);
+ } else {
+ Chunk chunk = this.getChunkIfLoaded(blockposition);
+ return chunk != null ? chunk.getFluid(blockposition) : null;
+ }
+ }
+ // Paper end
@Override
public Fluid getFluid(BlockPosition blockposition) {
--