forked from hpfxd/PandaSpigot
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path0075-Avoid-loading-chunks-in-multiple-places.patch
235 lines (211 loc) · 13.1 KB
/
0075-Avoid-loading-chunks-in-multiple-places.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: mechoriet <[email protected]>
Date: Fri, 18 Nov 2022 12:38:10 +0100
Subject: [PATCH] Avoid loading chunks in multiple places
diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java
index eed516e223607e84bb475c51cef21e7f0b1073c2..0cbbcd05e8f1c1b3bd85837c7dbe73a37e54b843 100644
--- a/src/main/java/net/minecraft/server/BlockChest.java
+++ b/src/main/java/net/minecraft/server/BlockChest.java
@@ -50,7 +50,12 @@ public class BlockChest extends BlockContainer {
while (iterator.hasNext()) {
EnumDirection enumdirection = (EnumDirection) iterator.next();
BlockPosition blockposition1 = blockposition.shift(enumdirection);
- IBlockData iblockdata1 = world.getType(blockposition1);
+ IBlockData iblockdata1 = world.getTypeIfLoaded(blockposition1);
+ // PandaSpigot start - Use getTypeIfLoaded
+ if (iblockdata1 == null) {
+ continue;
+ }
+ // PandaSpigot end
if (iblockdata1.getBlock() == this) {
this.e(world, blockposition1, iblockdata1);
diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
index 76cd512964ce86c8488e0985fd43afc0050bb4a2..dfcf556b6bb82a5ff971fee645323d463c45ed0f 100644
--- a/src/main/java/net/minecraft/server/BlockFire.java
+++ b/src/main/java/net/minecraft/server/BlockFire.java
@@ -176,6 +176,7 @@ public class BlockFire extends Block {
}
BlockPosition blockposition1 = blockposition.a(j, l, k);
+ if (!world.isLoaded(blockposition1)) continue; // PandaSpigot - Prevent Fire from loading chunks
int j1 = this.m(world, blockposition1);
if (j1 > 0) {
@@ -244,10 +245,14 @@ public class BlockFire extends Block {
}
private void a(World world, BlockPosition blockposition, int i, Random random, int j) {
- int k = this.c(world.getType(blockposition).getBlock());
+ // PandaSpigot start - Prevent Fire from loading chunks
+ final IBlockData iblockdata = world.getTypeIfLoaded(blockposition);
+ if (iblockdata == null) return;
+ int k = this.c(iblockdata.getBlock());
+ // PandaSpigot end
if (random.nextInt(i) < k) {
- IBlockData iblockdata = world.getType(blockposition);
+ //IBlockData iblockdata = world.getType(blockposition); // PandaSpigot - removed since assigned if loaded just above
// CraftBukkit start
org.bukkit.block.Block theBlock = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
@@ -305,7 +310,11 @@ public class BlockFire extends Block {
for (int k = 0; k < j; ++k) {
EnumDirection enumdirection = aenumdirection[k];
- i = Math.max(this.d(world.getType(blockposition.shift(enumdirection)).getBlock()), i);
+ // PandaSpigot start - only assign i if chunk is loaded; otherwise skip
+ final IBlockData type = world.getTypeIfLoaded(blockposition.shift(enumdirection));
+ if (type == null) continue;
+ i = Math.max(this.d(type.getBlock()), i);
+ // PandaSpigot end
}
return i;
diff --git a/src/main/java/net/minecraft/server/BlockLeaves.java b/src/main/java/net/minecraft/server/BlockLeaves.java
index 7bf9018bae77e97ce5d2991897edf186ef1ed741..399c2bddd4e0ed27a98ab07a20d981f39683a4c3 100644
--- a/src/main/java/net/minecraft/server/BlockLeaves.java
+++ b/src/main/java/net/minecraft/server/BlockLeaves.java
@@ -69,7 +69,7 @@ public abstract class BlockLeaves extends BlockTransparent {
for (k1 = -b0; k1 <= b0; ++k1) {
for (l1 = -b0; l1 <= b0; ++l1) {
for (i2 = -b0; i2 <= b0; ++i2) {
- Block block = world.getType(blockposition_mutableblockposition.c(j + k1, k + l1, l + i2)).getBlock();
+ Block block = world.getTypeIfLoaded(blockposition_mutableblockposition.c(j + k1, k + l1, l + i2)).getBlock(); // PandaSpigot - Use getTypeIfLoaded
if (block != Blocks.LOG && block != Blocks.LOG2) {
if (block.getMaterial() == Material.LEAVES) {
diff --git a/src/main/java/net/minecraft/server/ChunkCache.java b/src/main/java/net/minecraft/server/ChunkCache.java
index 45d385d31296eda75aa30500118c21406df5fe43..e953d6d80ef020f8e4540eae6881709fc8906b8f 100644
--- a/src/main/java/net/minecraft/server/ChunkCache.java
+++ b/src/main/java/net/minecraft/server/ChunkCache.java
@@ -23,7 +23,7 @@ public class ChunkCache implements IBlockAccess {
for (l = this.a; l <= j; ++l) {
for (i1 = this.b; i1 <= k; ++i1) {
- this.c[l - this.a][i1 - this.b] = world.getChunkAt(l, i1);
+ this.c[l - this.a][i1 - this.b] = world.getChunkIfLoaded(l, i1); // PandaSpigot - Don't load chunks for pathfinding
}
}
diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
index f3afbbd3a20ebf7d51a8fac418cff3e6f59ab56f..6d5fec85c8a79df2ea299c31196bab58f722fa9e 100644
--- a/src/main/java/net/minecraft/server/EntityEnderman.java
+++ b/src/main/java/net/minecraft/server/EntityEnderman.java
@@ -352,7 +352,10 @@ public class EntityEnderman extends EntityMonster {
int j = MathHelper.floor(this.enderman.locY + random.nextDouble() * 3.0D);
int k = MathHelper.floor(this.enderman.locZ - 2.0D + random.nextDouble() * 4.0D);
BlockPosition blockposition = new BlockPosition(i, j, k);
- IBlockData iblockdata = world.getType(blockposition);
+ // PandaSpigot start - avoid loading chunks
+ IBlockData iblockdata = world.getTypeIfLoaded(blockposition);
+ if (iblockdata == null) return;
+ // PandaSpigot end
Block block = iblockdata.getBlock();
if (EntityEnderman.c.contains(block)) {
@@ -386,10 +389,13 @@ public class EntityEnderman extends EntityMonster {
int j = MathHelper.floor(this.a.locY + random.nextDouble() * 2.0D);
int k = MathHelper.floor(this.a.locZ - 1.0D + random.nextDouble() * 2.0D);
BlockPosition blockposition = new BlockPosition(i, j, k);
- Block block = world.getType(blockposition).getBlock();
+ // PandaSpigot start - avoid loading chunks
+ IBlockData iblockdata = world.getTypeIfLoaded(blockposition);
+ if (iblockdata == null) return;
Block block1 = world.getType(blockposition.down()).getBlock();
- if (this.a(world, blockposition, this.a.getCarried().getBlock(), block, block1)) {
+ if (this.a(world, blockposition, this.a.getCarried().getBlock(), iblockdata.getBlock(), block1)) {
+ // PandaSpigot end
// CraftBukkit start - Place event
if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.a, blockposition.getX(), blockposition.getY(), blockposition.getZ(), this.a.getCarried().getBlock(), this.a.getCarried().getBlock().toLegacyData(this.a.getCarried())).isCancelled()) {
world.setTypeAndData(blockposition, this.a.getCarried(), 3);
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
index 284f4bf2f6b7790a85d22fa1d4e5fa37f1f4aca2..5dfc94b0d6dd44f2fa283a0c601f448be88a1aa4 100644
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -151,7 +151,7 @@ public final class SpawnerCreature {
if (i4 < 4) {
label108: {
j3 += worldserver.random.nextInt(b1) - worldserver.random.nextInt(b1);
- k3 += worldserver.random.nextInt(1) - worldserver.random.nextInt(1);
+ //k3 += worldserver.random.nextInt(1) - worldserver.random.nextInt(1); // PandaSpigot
l3 += worldserver.random.nextInt(b1) - worldserver.random.nextInt(b1);
BlockPosition blockposition2 = new BlockPosition(j3, k3, l3);
float f = (float) j3 + 0.5F;
diff --git a/src/main/java/net/minecraft/server/Village.java b/src/main/java/net/minecraft/server/Village.java
index e67aa0423f6a28b286174662f29ffc32a74992d9..22c3ac7a71043ab82e7d3c95c71e02fa8b8927ef 100644
--- a/src/main/java/net/minecraft/server/Village.java
+++ b/src/main/java/net/minecraft/server/Village.java
@@ -37,11 +37,35 @@ public class Village {
this.a = world;
}
+ // PandaSpigot start
+ private BlockPosition[] positions = null;
+ private void calculateNewCheckPositions() {
+ if(this.d == null || this.d.equals(BlockPosition.ZERO)) {
+ this.positions = null;
+ } else {
+ this.positions = new BlockPosition[] { this.d.a(-this.e, 0, -this.e),
+ this.d.a(-this.e, 0, this.e),
+ this.d.a(this.e, 0, -this.e),
+ this.d.a(this.e, 0, this.e),
+ this.d};
+ }
+ }
+ public boolean isVillageAreaLoaded() {
+ for(int i = 0; this.positions != null && i < this.positions.length; i++) {
+ if(this.a.isLoaded(this.positions[i])) {
+ return true;
+ }
+ }
+ return false;
+ }
+ // PandaSpigot end
+
public void a(World world) {
this.a = world;
}
public void a(int i) {
+ if(!this.isVillageAreaLoaded()) return; // PandaSpigot - avoid loading chunks
this.g = i;
this.m();
this.l();
@@ -341,6 +365,7 @@ public class Village {
this.e = Math.max(32, (int) Math.sqrt((double) j) + 1);
}
+ this.calculateNewCheckPositions(); // PandaSpigot
}
public int a(String s) {
@@ -395,6 +420,7 @@ public class Village {
this.j.put(nbttagcompound2.getString("Name"), Integer.valueOf(nbttagcompound2.getInt("S")));
}
}
+ this.calculateNewCheckPositions(); // PandaSpigot
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index a429dc5e950a31557d444d0a50ed71d13f13d555..46ebdb5e22592658cbd8172390b52edac5344e0f 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -874,7 +874,10 @@ public abstract class World implements IBlockAccess {
int i1 = MathHelper.floor(vec3d.b);
int j1 = MathHelper.floor(vec3d.c);
BlockPosition blockposition = new BlockPosition(l, i1, j1);
- IBlockData iblockdata = this.getType(blockposition);
+ // PandaSpigot start - avoid loading chunks
+ IBlockData iblockdata = this.getTypeIfLoaded(blockposition);
+ if (iblockdata == null) return null;
+ // PandaSpigot end
Block block = iblockdata.getBlock();
if ((!flag1 || block.a(this, blockposition, iblockdata) != null) && block.a(iblockdata, flag)) {
@@ -976,7 +979,10 @@ public abstract class World implements IBlockAccess {
i1 = MathHelper.floor(vec3d.b) - (enumdirection == EnumDirection.UP ? 1 : 0);
j1 = MathHelper.floor(vec3d.c) - (enumdirection == EnumDirection.SOUTH ? 1 : 0);
blockposition = new BlockPosition(l, i1, j1);
- IBlockData iblockdata1 = this.getType(blockposition);
+ // PandaSpigot start - ray tracing into an unloaded chunk should be treated as a miss, this saves a ton of lag for when AI tries to raytrace near unloaded chunks.
+ IBlockData iblockdata1 = this.getTypeIfLoaded(blockposition);
+ if (iblockdata1 == null) return null;
+ // PandaSpigot end
Block block1 = iblockdata1.getBlock();
if (!flag1 || block1.a(this, blockposition, iblockdata1) != null) {
@@ -2712,8 +2718,11 @@ public abstract class World implements IBlockAccess {
for (int i1 = i; i1 <= j; ++i1) {
for (int j1 = k; j1 <= l; ++j1) {
- if (this.isChunkLoaded(i1, j1, true)) {
- this.getChunkAt(i1, j1).a(entity, axisalignedbb, arraylist, predicate);
+ // PandaSpigot start - Use getChunkIfLoaded
+ Chunk chunk = this.getChunkIfLoaded(i1, j1);
+ if (chunk != null) {
+ chunk.a(entity, axisalignedbb, arraylist, predicate);
+ // PandaSpigot end
}
}
}