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

More patches for 1.14

Browse Source
This commit is contained in:
William Blake Galbreath
2019-05-05 03:33:44 -05:00
parent f542bdef09
commit 3f43b7abe8
40 changed files with 537 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Spigot-Server-Patches/Prevent-chunk-loading-from-Fluid-Flowing.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent chunk loading from Fluid Flowing
diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
index 431602cac1..c0955d6ec2 100644
index c76fa0b4b..5f1514360 100644
--- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java
+++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
@@ -0,0 +0,0 @@ public abstract class FluidTypeFlowing extends FluidType {
@@ -16,7 +16,7 @@ index 431602cac1..c0955d6ec2 100644
+ IBlockData iblockdata1 = generatoraccess.getTypeIfLoaded(blockposition1); // Paper
+ if (iblockdata1 == null) continue; // Paper
if (this.a(generatoraccess, blockposition, iblockdata, enumdirection, blockposition1, iblockdata1, generatoraccess.getFluid(blockposition1), fluid1.c())) {
if (this.a(generatoraccess, blockposition, iblockdata, enumdirection, blockposition1, iblockdata1, generatoraccess.getFluid(blockposition1), fluid1.getType())) {
// CraftBukkit start
@@ -0,0 +0,0 @@ public abstract class FluidTypeFlowing extends FluidType {
while (iterator.hasNext()) {
@@ -25,9 +25,9 @@ index 431602cac1..c0955d6ec2 100644
- IBlockData iblockdata1 = iworldreader.getType(blockposition1);
+ IBlockData iblockdata1 = iworldreader.getTypeIfLoaded(blockposition1); // Paper
+ if (iblockdata1 == null) continue; // Paper
Fluid fluid = iblockdata1.s();
Fluid fluid = iblockdata1.p();
if (fluid.c().a((FluidType) this) && this.a(enumdirection, (IBlockAccess) iworldreader, blockposition, iblockdata, blockposition1, iblockdata1)) {
if (fluid.getType().a((FluidType) this) && this.a(enumdirection, (IBlockAccess) iworldreader, blockposition, iblockdata, blockposition1, iblockdata1)) {
@@ -0,0 +0,0 @@ public abstract class FluidTypeFlowing extends FluidType {
if (enumdirection1 != enumdirection) {
BlockPosition blockposition2 = blockposition.shift(enumdirection1);
@@ -41,15 +41,14 @@ index 431602cac1..c0955d6ec2 100644
+ if (iblockdatax == null) {
+ continue;
+ }
+
+ pair = Pair.of(iblockdatax, iblockdatax.s());
- return Pair.of(iblockdata1, iblockdata1.p());
- });
+ pair = Pair.of(iblockdatax, iblockdatax.p());
+ short2objectmap.put(short0, pair);
+
+ }
+ // Paper end
- return Pair.of(iblockdata1, iblockdata1.s());
- });
IBlockData iblockdata1 = (IBlockData) pair.getFirst();
Fluid fluid = (Fluid) pair.getSecond();
@@ -60,7 +59,7 @@ index 431602cac1..c0955d6ec2 100644
- Pair<IBlockData, Fluid> pair = (Pair) short2objectmap.computeIfAbsent(short0, (j) -> {
- IBlockData iblockdata1 = iworldreader.getType(blockposition1);
-
- return Pair.of(iblockdata1, iblockdata1.s());
- return Pair.of(iblockdata1, iblockdata1.p());
- });
+ // Paper start
+ Pair pair = (Pair) short2objectmap.get(short0);
@@ -68,7 +67,7 @@ index 431602cac1..c0955d6ec2 100644
+ IBlockData iblockdatax = iworldreader.getTypeIfLoaded(blockposition1);
+ if (iblockdatax == null) continue;
+
+ pair = Pair.of(iblockdatax, iblockdatax.s());
+ pair = Pair.of(iblockdatax, iblockdatax.p());
+ short2objectmap.put(short0, pair);
+ }
+ // Paper end