Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.4(.2).

Browse Source
This commit is contained in:
Travis Watkins
2012-10-24 22:53:23 -05:00
committed by EvilSeph
parent b9a72531b6
commit 60819c6693
237 changed files with 10104 additions and 4863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/java/net/minecraft/server/AABBPool.java
View File

@@ -7,10 +7,10 @@ public class AABBPool {
private final int a;
private final int b;
private final List c = new ArrayList();
private final List pool = new ArrayList();
private int d = 0;
private int e = 0;
private int f = 0;
private int largestSize = 0;
private int resizeTime = 0;
public AABBPool(int i, int j) {
this.a = i;
@@ -18,15 +18,15 @@ public class AABBPool {
}
public AxisAlignedBB a(double d0, double d1, double d2, double d3, double d4, double d5) {
if (this.f == 0) return new AxisAlignedBB(d0, d1, d2, d3, d4, d5); // CraftBukkit - don't pool objects indefinitely if thread doesn't adhere to contract
// CraftBukkit - don't pool objects indefinitely if thread doesn't adhere to contract
if (this.resizeTime == 0) return new AxisAlignedBB(d0, d1, d2, d3, d4, d5);
AxisAlignedBB axisalignedbb;
if (this.d >= this.c.size()) {
if (this.d >= this.pool.size()) {
axisalignedbb = new AxisAlignedBB(d0, d1, d2, d3, d4, d5);
this.c.add(axisalignedbb);
this.pool.add(axisalignedbb);
} else {
axisalignedbb = (AxisAlignedBB) this.c.get(this.d);
axisalignedbb = (AxisAlignedBB) this.pool.get(this.d);
axisalignedbb.b(d0, d1, d2, d3, d4, d5);
}
@@ -35,24 +35,34 @@ public class AABBPool {
}
public void a() {
if (this.d > this.e) {
this.e = this.d;
if (this.d > this.largestSize) {
this.largestSize = this.d;
}
// CraftBukkit start - intelligent cache
if ((this.f++ & 0xff) == 0) {
int newSize = this.c.size() - (this.c.size() >> 3);
if (newSize > this.e) { // newSize will be 87.5%, but if we were not in that range, we clear some of the cache
for (int i = this.c.size() - 1; i > newSize; i--) { // Work down from size() to prevent insane array copies
this.c.remove(i);
if ((this.resizeTime++ & 0xff) == 0) {
int newSize = this.pool.size() - (this.pool.size() >> 3);
// newSize will be 87.5%, but if we were not in that range, we clear some of the cache
if (newSize > this.largestSize) {
// Work down from size() to prevent insane array copies
for (int i = this.pool.size() - 1; i > newSize; i--) {
this.pool.remove(i);
}
}
this.e = 0;
// this.f = 0; // We do not reset to zero; it doubles for a flag
this.largestSize = 0;
// this.resizeTime = 0; // We do not reset to zero; it doubles for a flag
}
// CraftBukkit end
this.d = 0;
}
public int c() {
return this.pool.size();
}
public int d() {
return this.d;
}
}