Krenair

Untitled

Dec 18th, 2011
266
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 3.84 KB | None | 0 0
  1. alex@alex:~$ diff MCP5/src/minecraft/net/minecraft/src/StructureBoundingBox.java MCP5/src/minecraft_server/net/minecraft/src/StructureBoundingBox.java
  2. 6,11c6,11
  3. < public int minX;
  4. < public int minY;
  5. < public int minZ;
  6. < public int maxX;
  7. < public int maxY;
  8. < public int maxZ;
  9. ---
  10. > public int x1;
  11. > public int y1;
  12. > public int z1;
  13. > public int x2;
  14. > public int y2;
  15. > public int z2;
  16. 36,41c36,41
  17. < this.minX = var1.minX;
  18. < this.minY = var1.minY;
  19. < this.minZ = var1.minZ;
  20. < this.maxX = var1.maxX;
  21. < this.maxY = var1.maxY;
  22. < this.maxZ = var1.maxZ;
  23. ---
  24. > this.x1 = var1.x1;
  25. > this.y1 = var1.y1;
  26. > this.z1 = var1.z1;
  27. > this.x2 = var1.x2;
  28. > this.y2 = var1.y2;
  29. > this.z2 = var1.z2;
  30. 45,50c45,50
  31. < this.minX = var1;
  32. < this.minY = var2;
  33. < this.minZ = var3;
  34. < this.maxX = var4;
  35. < this.maxY = var5;
  36. < this.maxZ = var6;
  37. ---
  38. > this.x1 = var1;
  39. > this.y1 = var2;
  40. > this.z1 = var3;
  41. > this.x2 = var4;
  42. > this.y2 = var5;
  43. > this.z2 = var6;
  44. 54,59c54,59
  45. < this.minX = var1;
  46. < this.minY = 0;
  47. < this.minZ = var2;
  48. < this.maxX = var3;
  49. < this.maxY = 65536;
  50. < this.maxZ = var4;
  51. ---
  52. > this.x1 = var1;
  53. > this.y1 = 0;
  54. > this.z1 = var2;
  55. > this.x2 = var3;
  56. > this.y2 = 65536;
  57. > this.z2 = var4;
  58. 62,63c62,63
  59. < public boolean intersectsWith(StructureBoundingBox var1) {
  60. < 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;
  61. ---
  62. > public boolean canFitInside(StructureBoundingBox var1) {
  63. > 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;
  64. 66,67c66,67
  65. < public boolean isInsideStructureBB(int var1, int var2, int var3, int var4) {
  66. < return this.maxX >= var1 && this.minX <= var3 && this.maxZ >= var2 && this.minZ <= var4;
  67. ---
  68. > public boolean isInBbArea(int var1, int var2, int var3, int var4) {
  69. > return this.x2 >= var1 && this.x1 <= var3 && this.z2 >= var2 && this.z1 <= var4;
  70. 70,76c70,76
  71. < public void resizeBoundingBoxTo(StructureBoundingBox var1) {
  72. < this.minX = Math.min(this.minX, var1.minX);
  73. < this.minY = Math.min(this.minY, var1.minY);
  74. < this.minZ = Math.min(this.minZ, var1.minZ);
  75. < this.maxX = Math.max(this.maxX, var1.maxX);
  76. < this.maxY = Math.max(this.maxY, var1.maxY);
  77. < this.maxZ = Math.max(this.maxZ, var1.maxZ);
  78. ---
  79. > public void expandTo(StructureBoundingBox var1) {
  80. > this.x1 = Math.min(this.x1, var1.x1);
  81. > this.y1 = Math.min(this.y1, var1.y1);
  82. > this.z1 = Math.min(this.z1, var1.z1);
  83. > this.x2 = Math.max(this.x2, var1.x2);
  84. > this.y2 = Math.max(this.y2, var1.y2);
  85. > this.z2 = Math.max(this.z2, var1.z2);
  86. 88,89c88,89
  87. < public boolean isVecInside(int var1, int var2, int var3) {
  88. < return var1 >= this.minX && var1 <= this.maxX && var3 >= this.minZ && var3 <= this.maxZ && var2 >= this.minY && var2 <= this.maxY;
  89. ---
  90. > public boolean isInBbVolume(int var1, int var2, int var3) {
  91. > return var1 >= this.x1 && var1 <= this.x2 && var3 >= this.z1 && var3 <= this.z2 && var2 >= this.y1 && var2 <= this.y2;
  92. 92,93c92,93
  93. < public int getXSize() {
  94. < return this.maxX - this.minX + 1;
  95. ---
  96. > public int bbWidth() {
  97. > return this.x2 - this.x1 + 1;
  98. 96,97c96,97
  99. < public int getYSize() {
  100. < return this.maxY - this.minY + 1;
  101. ---
  102. > public int bbHeight() {
  103. > return this.y2 - this.y1 + 1;
  104. 100,101c100,101
  105. < public int getZSize() {
  106. < return this.maxZ - this.minZ + 1;
  107. ---
  108. > public int bbDepth() {
  109. > return this.z2 - this.z1 + 1;
Advertisement
Add Comment
Please, Sign In to add comment