mirror of
https://github.com/2006-Scape/2006Scape.git
synced 2026-07-04 08:39:05 +00:00
Def cleanup (#585)
* Object definition cleanup * Update ShopAssistant.java * stackables * notables * unused files * more junk * almost done * working * moving old methods to deprecated * update * fixed pickpocket typos * Update Pickpocket.java * Remove redundant method. Fix stall stealing * Documentation for deprecated methods * WIP commit partial removal. Has test and dump classes * Final cleanup * Move definitions from data folder to cfg * Temporarily moving definition loaders to GameEngine This is until loading can be done asynchronously. * Correct indentation.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
package com.rs2.game.objects;
|
||||
|
||||
import com.rs2.world.clip.ObjectDefinition;
|
||||
import org.apollo.cache.def.ObjectDefinition;
|
||||
|
||||
public class Objects {
|
||||
|
||||
@@ -39,7 +39,7 @@ public class Objects {
|
||||
}
|
||||
|
||||
public int[] getObjectSize() {
|
||||
ObjectDefinition def = ObjectDefinition.getObjectDef(objectId);
|
||||
ObjectDefinition def = ObjectDefinition.lookup(objectId);
|
||||
if (def == null) {
|
||||
return new int[] {1, 1};
|
||||
}
|
||||
@@ -49,11 +49,11 @@ public class Objects {
|
||||
int xLength;
|
||||
int yLength;
|
||||
if (objectFace != 1 && objectFace != 3) {
|
||||
xLength = def.xLength();
|
||||
yLength = def.yLength();
|
||||
xLength = def.getWidth();
|
||||
yLength = def.getLength();
|
||||
} else {
|
||||
xLength = def.yLength();
|
||||
yLength = def.xLength();
|
||||
xLength = def.getLength();
|
||||
yLength = def.getWidth();
|
||||
}
|
||||
|
||||
return new int[] {xLength, yLength};
|
||||
|
||||
Reference in New Issue
Block a user