merge fixes

This commit is contained in:
dginovker
2019-10-27 15:06:19 -04:00
156 changed files with 1583 additions and 2163 deletions
@@ -403,7 +403,7 @@ public abstract class Player {
totalDamageDealt, globalDamageDealt, oldNpcIndex, fightMode, attackTimer;
public boolean magicFailed, oldMagicFailed;
public int bowSpecShot, clickNpcType, clickObjectType, objectId, objectX,
objectY, objectXOffset, objectYOffset, objectDistance;
objectY;
public int pItemX, pItemY, pItemId;
public boolean isMoving, walkingToItem;
public boolean isShopping, updateShop;