SteamWar/SpigotCore
SteamWar/SpigotCore
Archiviert
13
0
Fork 0
Code Issues 4 Pull-Requests 1 Releases Wiki Aktivität

Revert "Hotfix wrong fix"

Quellcode durchsuchen 
This reverts commit aa835be3
Dieser Commit ist enthalten in:
Lixfel 2020-04-03 19:20:52 +02:00
Ursprung aa835be357
Commit aaed31f072
1 geänderte Dateien mit 12 neuen und 12 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

24
SpigotCore_14/src/de/steamwar/sql/Schematic_14.java
Datei anzeigen

@ -155,18 +155,18 @@ class Schematic_14 {
short height = requireTag(schematic, "Height", ShortTag.class).getValue(); short height = requireTag(schematic, "Height", ShortTag.class).getValue();
short length = requireTag(schematic, "Length", ShortTag.class).getValue(); short length = requireTag(schematic, "Length", ShortTag.class).getValue();
int offsetX = 0; int originX = 0;
int offsetY = 0; int originY = 0;
int offsetZ = 0; int originZ = 0;
try { try {
int originX = requireTag(schematic, "WEOriginX", IntTag.class).getValue(); originX = requireTag(schematic, "WEOriginX", IntTag.class).getValue();
int originY = requireTag(schematic, "WEOriginY", IntTag.class).getValue(); originY = requireTag(schematic, "WEOriginY", IntTag.class).getValue();
int originZ = requireTag(schematic, "WEOriginZ", IntTag.class).getValue(); originZ = requireTag(schematic, "WEOriginZ", IntTag.class).getValue();
BlockVector3 min = BlockVector3.at(originX, originY, originZ); BlockVector3 min = BlockVector3.at(originX, originY, originZ);
offsetX = requireTag(schematic, "WEOffsetX", IntTag.class).getValue(); int offsetX = requireTag(schematic, "WEOffsetX", IntTag.class).getValue();
offsetY = requireTag(schematic, "WEOffsetY", IntTag.class).getValue(); int offsetY = requireTag(schematic, "WEOffsetY", IntTag.class).getValue();
offsetZ = requireTag(schematic, "WEOffsetZ", IntTag.class).getValue(); int offsetZ = requireTag(schematic, "WEOffsetZ", IntTag.class).getValue();
BlockVector3 offset = BlockVector3.at(offsetX, offsetY, offsetZ); BlockVector3 offset = BlockVector3.at(offsetX, offsetY, offsetZ);
origin = min.subtract(offset); origin = min.subtract(offset);
@ -232,9 +232,9 @@ class Schematic_14 {
int y = t.getInt("y"); int y = t.getInt("y");
int z = t.getInt("z"); int z = t.getInt("z");
if(faweSchem){ if(faweSchem){
x -= offsetX; x -= originX;
y -= offsetY; y -= originY;
z -= offsetZ; z -= originZ;
} }
int index = y * width * length + z * width + x; int index = y * width * length + z * width + x;