Untitled

alex@alex:~$ diff MCP5/src/minecraft/net/minecraft/src/StructureBoundingBox.java MCP5/src/minecraft_server/net/minecraft/src/StructureBoundingBox.java

6,11c6,11

< public int minX;

< public int minY;

< public int minZ;

< public int maxX;

< public int maxY;

< public int maxZ;

---

> public int x1;

> public int y1;

> public int z1;

> public int x2;

> public int y2;

> public int z2;

36,41c36,41

< this.minX = var1.minX;

< this.minY = var1.minY;

< this.minZ = var1.minZ;

< this.maxX = var1.maxX;

< this.maxY = var1.maxY;

< this.maxZ = var1.maxZ;

---

> this.x1 = var1.x1;

> this.y1 = var1.y1;

> this.z1 = var1.z1;

> this.x2 = var1.x2;

> this.y2 = var1.y2;

> this.z2 = var1.z2;

45,50c45,50

< this.minX = var1;

< this.minY = var2;

< this.minZ = var3;

< this.maxX = var4;

< this.maxY = var5;

< this.maxZ = var6;

---

> this.x1 = var1;

> this.y1 = var2;

> this.z1 = var3;

> this.x2 = var4;

> this.y2 = var5;

> this.z2 = var6;

54,59c54,59

< this.minX = var1;

< this.minY = 0;

< this.minZ = var2;

< this.maxX = var3;

< this.maxY = 65536;

< this.maxZ = var4;

---

> this.x1 = var1;

> this.y1 = 0;

> this.z1 = var2;

> this.x2 = var3;

> this.y2 = 65536;

> this.z2 = var4;

62,63c62,63

< public boolean intersectsWith(StructureBoundingBox var1) {

< return this.maxX >= var1.minX && this.minX <= var1.maxX && this.maxZ >= var1.minZ && this.minZ <= var1.maxZ && this.maxY >= var1.minY && this.minY <= var1.maxY;

---

> public boolean canFitInside(StructureBoundingBox var1) {

> return this.x2 >= var1.x1 && this.x1 <= var1.x2 && this.z2 >= var1.z1 && this.z1 <= var1.z2 && this.y2 >= var1.y1 && this.y1 <= var1.y2;

66,67c66,67

< public boolean isInsideStructureBB(int var1, int var2, int var3, int var4) {

< return this.maxX >= var1 && this.minX <= var3 && this.maxZ >= var2 && this.minZ <= var4;

---

> public boolean isInBbArea(int var1, int var2, int var3, int var4) {

> return this.x2 >= var1 && this.x1 <= var3 && this.z2 >= var2 && this.z1 <= var4;

70,76c70,76

< public void resizeBoundingBoxTo(StructureBoundingBox var1) {

< this.minX = Math.min(this.minX, var1.minX);

< this.minY = Math.min(this.minY, var1.minY);

< this.minZ = Math.min(this.minZ, var1.minZ);

< this.maxX = Math.max(this.maxX, var1.maxX);

< this.maxY = Math.max(this.maxY, var1.maxY);

< this.maxZ = Math.max(this.maxZ, var1.maxZ);

---

> public void expandTo(StructureBoundingBox var1) {

> this.x1 = Math.min(this.x1, var1.x1);

> this.y1 = Math.min(this.y1, var1.y1);

> this.z1 = Math.min(this.z1, var1.z1);

> this.x2 = Math.max(this.x2, var1.x2);

> this.y2 = Math.max(this.y2, var1.y2);

> this.z2 = Math.max(this.z2, var1.z2);

88,89c88,89

< public boolean isVecInside(int var1, int var2, int var3) {

< return var1 >= this.minX && var1 <= this.maxX && var3 >= this.minZ && var3 <= this.maxZ && var2 >= this.minY && var2 <= this.maxY;

---

> public boolean isInBbVolume(int var1, int var2, int var3) {

> return var1 >= this.x1 && var1 <= this.x2 && var3 >= this.z1 && var3 <= this.z2 && var2 >= this.y1 && var2 <= this.y2;

92,93c92,93

< public int getXSize() {

< return this.maxX - this.minX + 1;

---

> public int bbWidth() {

> return this.x2 - this.x1 + 1;

96,97c96,97

< public int getYSize() {

< return this.maxY - this.minY + 1;

---

> public int bbHeight() {

> return this.y2 - this.y1 + 1;

100,101c100,101

< public int getZSize() {

< return this.maxZ - this.minZ + 1;

---

> public int bbDepth() {

> return this.z2 - this.z1 + 1;