Skip to content

Commit da37ae7

Browse files
grumgrum
committed
1.6.6_01
1 parent 5c511d8 commit da37ae7

File tree

104 files changed

+732
-732
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+732
-732
lines changed

Diff for: ‎net/minecraft/server/BlockDispenser.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ private void dispense(World world, int i, int j, int k, Random random) {
9595
EntityArrow entityarrow = new EntityArrow(world, d0, d1, d2);
9696

9797
entityarrow.a((double) b0, 0.10000000149011612D, (double) b1, 1.1F, 6.0F);
98-
entityarrow.a = true;
98+
entityarrow.fromPlayer = true;
9999
world.addEntity(entityarrow);
100100
world.e(1002, i, j, k, 0);
101101
} else if (itemstack.id == Item.EGG.id) {

Diff for: ‎net/minecraft/server/BlockPortal.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,15 @@ public boolean a_(World world, int i, int j, int k) {
7676
}
7777
}
7878

79-
world.o = true;
79+
world.suppressPhysics = true;
8080

8181
for (l = 0; l < 2; ++l) {
8282
for (i1 = 0; i1 < 3; ++i1) {
8383
world.setTypeId(i + b0 * l, j + i1, k + b1 * l, Block.PORTAL.id);
8484
}
8585
}
8686

87-
world.o = false;
87+
world.suppressPhysics = false;
8888
return true;
8989
}
9090
}

Diff for: ‎net/minecraft/server/BlockRedstoneWire.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ private void a(World world, int i, int j, int k, int l, int i1, int j1) {
103103
}
104104

105105
if (k1 != l1) {
106-
world.o = true;
106+
world.suppressPhysics = true;
107107
world.setData(i, j, k, l1);
108108
world.b(i, j, k, i, j, k);
109-
world.o = false;
109+
world.suppressPhysics = false;
110110

111111
for (i2 = 0; i2 < 4; ++i2) {
112112
j2 = i;

Diff for: ‎net/minecraft/server/BlockSand.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
public class BlockSand extends Block {
66

7-
public static boolean a = false;
7+
public static boolean instaFall = false;
88

99
public BlockSand(int i, int j) {
1010
super(i, j, Material.SAND);
@@ -26,7 +26,7 @@ private void g(World world, int i, int j, int k) {
2626
if (c_(world, i, j - 1, k) && j >= 0) {
2727
byte b0 = 32;
2828

29-
if (!a && world.a(i - b0, j - b0, k - b0, i + b0, j + b0, k + b0)) {
29+
if (!instaFall && world.a(i - b0, j - b0, k - b0, i + b0, j + b0, k + b0)) {
3030
EntityFallingSand entityfallingsand = new EntityFallingSand(world, (double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), this.id);
3131

3232
world.addEntity(entityfallingsand);

Diff for: ‎net/minecraft/server/BlockStationary.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ public void doPhysics(World world, int i, int j, int k, int l) {
2222
private void i(World world, int i, int j, int k) {
2323
int l = world.getData(i, j, k);
2424

25-
world.o = true;
25+
world.suppressPhysics = true;
2626
world.setRawTypeIdAndData(i, j, k, this.id - 1, l);
2727
world.b(i, j, k, i, j, k);
2828
world.c(i, j, k, this.id - 1, this.c());
29-
world.o = false;
29+
world.suppressPhysics = false;
3030
}
3131

3232
public void a(World world, int i, int j, int k, Random random) {

Diff for: ‎net/minecraft/server/BlockTNT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public int a(Random random) {
2626
public void c(World world, int i, int j, int k) {
2727
EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(world, (double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F));
2828

29-
entitytntprimed.a = world.random.nextInt(entitytntprimed.a / 4) + entitytntprimed.a / 8;
29+
entitytntprimed.fuseTicks = world.random.nextInt(entitytntprimed.fuseTicks / 4) + entitytntprimed.fuseTicks / 8;
3030
world.addEntity(entitytntprimed);
3131
}
3232

Diff for: ‎net/minecraft/server/Chunk.java

+20-20
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class Chunk {
1515
public NibbleArray e;
1616
public NibbleArray f;
1717
public NibbleArray g;
18-
public byte[] h;
18+
public byte[] heightMap;
1919
public int i;
2020
public final int x;
2121
public final int z;
@@ -37,7 +37,7 @@ public Chunk(World world, int i, int j) {
3737
this.world = world;
3838
this.x = i;
3939
this.z = j;
40-
this.h = new byte[256];
40+
this.heightMap = new byte[256];
4141

4242
for (int k = 0; k < this.entitySlices.length; ++k) {
4343
this.entitySlices[k] = new ArrayList();
@@ -57,12 +57,12 @@ public boolean a(int i, int j) {
5757
}
5858

5959
public int b(int i, int j) {
60-
return this.h[j << 4 | i] & 255;
60+
return this.heightMap[j << 4 | i] & 255;
6161
}
6262

6363
public void a() {}
6464

65-
public void b() {
65+
public void initLighting() {
6666
int i = 127;
6767

6868
int j;
@@ -78,7 +78,7 @@ public void b() {
7878
;
7979
}
8080

81-
this.h[k << 4 | j] = (byte) l;
81+
this.heightMap[k << 4 | j] = (byte) l;
8282
if (l < i) {
8383
i = l;
8484
}
@@ -136,7 +136,7 @@ private void f(int i, int j, int k) {
136136
}
137137

138138
private void g(int i, int j, int k) {
139-
int l = this.h[k << 4 | i] & 255;
139+
int l = this.heightMap[k << 4 | i] & 255;
140140
int i1 = l;
141141

142142
if (j > l) {
@@ -149,7 +149,7 @@ private void g(int i, int j, int k) {
149149

150150
if (i1 != l) {
151151
this.world.g(i, k, i1, l);
152-
this.h[k << 4 | i] = (byte) i1;
152+
this.heightMap[k << 4 | i] = (byte) i1;
153153
int k1;
154154
int l1;
155155
int i2;
@@ -161,8 +161,8 @@ private void g(int i, int j, int k) {
161161

162162
for (l1 = 0; l1 < 16; ++l1) {
163163
for (i2 = 0; i2 < 16; ++i2) {
164-
if ((this.h[i2 << 4 | l1] & 255) < k1) {
165-
k1 = this.h[i2 << 4 | l1] & 255;
164+
if ((this.heightMap[i2 << 4 | l1] & 255) < k1) {
165+
k1 = this.heightMap[i2 << 4 | l1] & 255;
166166
}
167167
}
168168
}
@@ -220,7 +220,7 @@ public int getTypeId(int i, int j, int k) {
220220

221221
public boolean a(int i, int j, int k, int l, int i1) {
222222
byte b0 = (byte) l;
223-
int j1 = this.h[k << 4 | i] & 255;
223+
int j1 = this.heightMap[k << 4 | i] & 255;
224224
int k1 = this.b[i << 11 | k << 7 | j] & 255;
225225

226226
if (k1 == l && this.e.a(i, j, k) == i1) {
@@ -261,7 +261,7 @@ public boolean a(int i, int j, int k, int l, int i1) {
261261

262262
public boolean a(int i, int j, int k, int l) {
263263
byte b0 = (byte) l;
264-
int i1 = this.h[k << 4 | i] & 255;
264+
int i1 = this.heightMap[k << 4 | i] & 255;
265265
int j1 = this.b[i << 11 | k << 7 | j] & 255;
266266

267267
if (j1 == l) {
@@ -383,7 +383,7 @@ public void a(Entity entity, int i) {
383383
}
384384

385385
public boolean c(int i, int j, int k) {
386-
return j >= (this.h[k << 4 | i] & 255);
386+
return j >= (this.heightMap[k << 4 | i] & 255);
387387
}
388388

389389
public TileEntity d(int i, int j, int k) {
@@ -407,9 +407,9 @@ public TileEntity d(int i, int j, int k) {
407407
}
408408

409409
public void a(TileEntity tileentity) {
410-
int i = tileentity.e - this.x * 16;
411-
int j = tileentity.f;
412-
int k = tileentity.g - this.z * 16;
410+
int i = tileentity.x - this.x * 16;
411+
int j = tileentity.y;
412+
int k = tileentity.z - this.z * 16;
413413

414414
this.a(i, j, k, tileentity);
415415
}
@@ -418,9 +418,9 @@ public void a(int i, int j, int k, TileEntity tileentity) {
418418
ChunkPosition chunkposition = new ChunkPosition(i, j, k);
419419

420420
tileentity.world = this.world;
421-
tileentity.e = this.x * 16 + i;
422-
tileentity.f = j;
423-
tileentity.g = this.z * 16 + k;
421+
tileentity.x = this.x * 16 + i;
422+
tileentity.y = j;
423+
tileentity.z = this.z * 16 + k;
424424
if (this.getTypeId(i, j, k) != 0 && Block.byId[this.getTypeId(i, j, k)] instanceof BlockContainer) {
425425
if (this.c) {
426426
if (this.tileEntities.get(chunkposition) != null) {
@@ -532,7 +532,7 @@ public boolean a(boolean flag) {
532532
}
533533
}
534534

535-
public int a(byte[] abyte, int i, int j, int k, int l, int i1, int j1, int k1) {
535+
public int getData(byte[] abyte, int i, int j, int k, int l, int i1, int j1, int k1) {
536536
int l1 = l - i;
537537
int i2 = i1 - j;
538538
int j2 = j1 - k;
@@ -597,7 +597,7 @@ public Random a(long i) {
597597
return new Random(this.world.getSeed() + (long) (this.x * this.x * 4987142) + (long) (this.x * 5947611) + (long) (this.z * this.z) * 4392871L + (long) (this.z * 389711) ^ i);
598598
}
599599

600-
public boolean g() {
600+
public boolean isEmpty() {
601601
return false;
602602
}
603603

Diff for: ‎net/minecraft/server/ChunkLoader.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,12 @@ public static void a(Chunk chunk, World world, NBTTagCompound nbttagcompound) {
118118
world.k();
119119
nbttagcompound.a("xPos", chunk.x);
120120
nbttagcompound.a("zPos", chunk.z);
121-
nbttagcompound.a("LastUpdate", world.getTime());
121+
nbttagcompound.setLong("LastUpdate", world.getTime());
122122
nbttagcompound.a("Blocks", chunk.b);
123123
nbttagcompound.a("Data", chunk.e.a);
124124
nbttagcompound.a("SkyLight", chunk.f.a);
125125
nbttagcompound.a("BlockLight", chunk.g.a);
126-
nbttagcompound.a("HeightMap", chunk.h);
126+
nbttagcompound.a("HeightMap", chunk.heightMap);
127127
nbttagcompound.a("TerrainPopulated", chunk.done);
128128
chunk.q = false;
129129
NBTTagList nbttaglist = new NBTTagList();
@@ -170,16 +170,16 @@ public static Chunk a(World world, NBTTagCompound nbttagcompound) {
170170
chunk.e = new NibbleArray(nbttagcompound.j("Data"));
171171
chunk.f = new NibbleArray(nbttagcompound.j("SkyLight"));
172172
chunk.g = new NibbleArray(nbttagcompound.j("BlockLight"));
173-
chunk.h = nbttagcompound.j("HeightMap");
173+
chunk.heightMap = nbttagcompound.j("HeightMap");
174174
chunk.done = nbttagcompound.m("TerrainPopulated");
175175
if (!chunk.e.a()) {
176176
chunk.e = new NibbleArray(chunk.b.length);
177177
}
178178

179-
if (chunk.h == null || !chunk.f.a()) {
180-
chunk.h = new byte[256];
179+
if (chunk.heightMap == null || !chunk.f.a()) {
180+
chunk.heightMap = new byte[256];
181181
chunk.f = new NibbleArray(chunk.b.length);
182-
chunk.b();
182+
chunk.initLighting();
183183
}
184184

185185
if (!chunk.g.a()) {

Diff for: ‎net/minecraft/server/ChunkProviderGenerate.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -200,12 +200,12 @@ public Chunk getOrCreateChunk(int i, int j) {
200200
Chunk chunk = new Chunk(this.p, abyte, i, j);
201201

202202
this.v = this.p.getWorldChunkManager().a(this.v, i * 16, j * 16, 16, 16);
203-
double[] adouble = this.p.getWorldChunkManager().a;
203+
double[] adouble = this.p.getWorldChunkManager().temperature;
204204

205205
this.a(i, j, abyte, this.v, adouble);
206206
this.a(i, j, abyte, this.v);
207207
this.u.a(this, this.p, i, j, abyte);
208-
chunk.b();
208+
chunk.initLighting();
209209
return chunk;
210210
}
211211

@@ -216,8 +216,8 @@ private double[] a(double[] adouble, int i, int j, int k, int l, int i1, int j1)
216216

217217
double d0 = 684.412D;
218218
double d1 = 684.412D;
219-
double[] adouble1 = this.p.getWorldChunkManager().a;
220-
double[] adouble2 = this.p.getWorldChunkManager().b;
219+
double[] adouble1 = this.p.getWorldChunkManager().temperature;
220+
double[] adouble2 = this.p.getWorldChunkManager().rain;
221221

222222
this.g = this.a.a(this.g, i, k, l, j1, 1.121D, 1.121D, 0.5D);
223223
this.h = this.b.a(this.h, i, k, l, j1, 200.0D, 200.0D, 0.5D);
@@ -322,7 +322,7 @@ public boolean isChunkLoaded(int i, int j) {
322322
}
323323

324324
public void getChunkAt(IChunkProvider ichunkprovider, int i, int j) {
325-
BlockSand.a = true;
325+
BlockSand.instaFall = true;
326326
int k = i * 16;
327327
int l = j * 16;
328328
BiomeBase biomebase = this.p.getWorldChunkManager().getBiome(k + 16, l + 16);
@@ -625,7 +625,7 @@ public void getChunkAt(IChunkProvider ichunkprovider, int i, int j) {
625625
}
626626
}
627627

628-
BlockSand.a = false;
628+
BlockSand.instaFall = false;
629629
}
630630

631631
public boolean saveChunks(boolean flag, IProgressUpdate iprogressupdate) {
@@ -636,7 +636,7 @@ public boolean unloadChunks() {
636636
return false;
637637
}
638638

639-
public boolean b() {
639+
public boolean canSave() {
640640
return true;
641641
}
642642
}

Diff for: ‎net/minecraft/server/ChunkProviderHell.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ public boolean isChunkLoaded(int i, int j) {
313313
}
314314

315315
public void getChunkAt(IChunkProvider ichunkprovider, int i, int j) {
316-
BlockSand.a = true;
316+
BlockSand.instaFall = true;
317317
int k = i * 16;
318318
int l = j * 16;
319319

@@ -370,7 +370,7 @@ public void getChunkAt(IChunkProvider ichunkprovider, int i, int j) {
370370
(new WorldGenFlowers(Block.RED_MUSHROOM.id)).a(this.n, this.h, j1, k1, l1);
371371
}
372372

373-
BlockSand.a = false;
373+
BlockSand.instaFall = false;
374374
}
375375

376376
public boolean saveChunks(boolean flag, IProgressUpdate iprogressupdate) {
@@ -381,7 +381,7 @@ public boolean unloadChunks() {
381381
return false;
382382
}
383383

384-
public boolean b() {
384+
public boolean canSave() {
385385
return true;
386386
}
387387
}

Diff for: ‎net/minecraft/server/ChunkProviderLoadOrGenerate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ public boolean unloadChunks() {
183183
return this.c.unloadChunks();
184184
}
185185

186-
public boolean b() {
186+
public boolean canSave() {
187187
return true;
188188
}
189189
}

Diff for: ‎net/minecraft/server/ChunkProviderServer.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class ChunkProviderServer implements IChunkProvider {
1414
private Chunk emptyChunk;
1515
private IChunkProvider chunkProvider;
1616
private IChunkLoader e;
17-
public boolean a = false;
17+
public boolean forceChunkLoad = false;
1818
private Map chunks = new HashMap();
1919
private List chunkList = new ArrayList();
2020
private WorldServer world;
@@ -87,7 +87,7 @@ public Chunk getChunkAt(int i, int j) {
8787
public Chunk getOrCreateChunk(int i, int j) {
8888
Chunk chunk = (Chunk) this.chunks.get(Integer.valueOf(ChunkCoordIntPair.a(i, j)));
8989

90-
return chunk == null ? (!this.world.isLoading && !this.a ? this.emptyChunk : this.getChunkAt(i, j)) : chunk;
90+
return chunk == null ? (!this.world.isLoading && !this.forceChunkLoad ? this.emptyChunk : this.getChunkAt(i, j)) : chunk;
9191
}
9292

9393
private Chunk loadChunk(int i, int j) {
@@ -174,7 +174,7 @@ public boolean saveChunks(boolean flag, IProgressUpdate iprogressupdate) {
174174
}
175175

176176
public boolean unloadChunks() {
177-
if (!this.world.E) {
177+
if (!this.world.canSave) {
178178
for (int i = 0; i < 100; ++i) {
179179
if (!this.unloadQueue.isEmpty()) {
180180
Integer integer = (Integer) this.unloadQueue.iterator().next();
@@ -197,7 +197,7 @@ public boolean unloadChunks() {
197197
return this.chunkProvider.unloadChunks();
198198
}
199199

200-
public boolean b() {
201-
return !this.world.E;
200+
public boolean canSave() {
201+
return !this.world.canSave;
202202
}
203203
}

0 commit comments

Comments
 (0)