2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-06 16:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix IOOBE when decoding object data, clean-up time, Major!.

Browse Source
This commit is contained in:
Ryley Kimmel
2015-03-04 00:31:57 -05:00
parent 4cacdc9891
commit 0b1134b5c9
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/apollo/fs/decoder/GameObjectDecoder.java
+12 -14
View File
@@ -118,8 +118,10 @@ public final class GameObjectDecoder {
Sector sector = REPOSITORY.fromPosition(position); Sector sector = REPOSITORY.fromPosition(position);
int x = position.getX(), y = position.getY(), height = position.getHeight(); int x = position.getX(), y = position.getY(), height = position.getHeight();
if (height < 0) // FIXME: For some reason the height is negative on some occasions
if (height < 0) {
return; return;
}
CollisionMatrix matrix = sector.getMatrix(height); CollisionMatrix matrix = sector.getMatrix(height);
@@ -149,10 +151,14 @@ public final class GameObjectDecoder {
int localX = (x % Sector.SECTOR_SIZE) + dx, localY = (y % Sector.SECTOR_SIZE) + dy; int localX = (x % Sector.SECTOR_SIZE) + dx, localY = (y % Sector.SECTOR_SIZE) + dy;
if (localX > 7 || localY > 7) { if (localX > 7 || localY > 7) {
Position nextPosition = new Position(x + localX - 7, y + localY - 7); int nextLocalX = localX > 7 ? x + localX - 7 : x + localX;
int nextLocalY = localY > 7 ? y + localY - 7 : y - localY;
Position nextPosition = new Position(nextLocalX, nextLocalY);
Sector next = REPOSITORY.fromPosition(nextPosition); Sector next = REPOSITORY.fromPosition(nextPosition);
int nextX = (nextPosition.getX() % Sector.SECTOR_SIZE) + dx, nextY = (nextPosition.getY() % Sector.SECTOR_SIZE) + dy; int nextX = (nextPosition.getX() % Sector.SECTOR_SIZE) + dx, nextY = (nextPosition.getY() % Sector.SECTOR_SIZE) + dy;
if(nextX > 7) nextX -= 7;
if(nextY > 7) nextY -= 7;
next.getMatrix(height).block(nextX, nextY); next.getMatrix(height).block(nextX, nextY);
continue; continue;
@@ -197,8 +203,11 @@ public final class GameObjectDecoder {
Sector sector = REPOSITORY.fromPosition(position); Sector sector = REPOSITORY.fromPosition(position);
int x = position.getX(), y = position.getY(), height = position.getHeight(); int x = position.getX(), y = position.getY(), height = position.getHeight();
if (height < 0) // FIXME: For some reason the height is negative on some occasions
if (height < 0) {
return; return;
}
CollisionMatrix current = sector.getMatrix(height); CollisionMatrix current = sector.getMatrix(height);
boolean block = false; boolean block = false;
@@ -214,17 +223,6 @@ public final class GameObjectDecoder {
if (block) { if (block) {
int localX = (x % Sector.SECTOR_SIZE), localY = (y % Sector.SECTOR_SIZE); int localX = (x % Sector.SECTOR_SIZE), localY = (y % Sector.SECTOR_SIZE);
if (localX > 7 || localY > 7) {
Position nextPosition = new Position(x + localX - 7, y + localY - 7);
Sector next = REPOSITORY.fromPosition(nextPosition);
int nextX = (nextPosition.getX() % Sector.SECTOR_SIZE), nextY = (nextPosition.getY() % Sector.SECTOR_SIZE);
next.getMatrix(height).block(nextX, nextY);
return;
}
current.block(localX, localY); current.block(localX, localY);
} }
} }