Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

fresh start

Browse Source
This commit is contained in:
FatBoy-DOTC
2023-09-10 15:51:25 -05:00
parent 13644fd308
commit ca6e079053
2 changed files with 3 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/handlers/AttackCmdMsgHandler.java
+1 -6
View File
@@ -41,7 +41,7 @@ public class AttackCmdMsgHandler extends AbstractClientMsgHandler {
if (playerCharacter == null)
return true;
AbstractWorldObject target;
AbstractWorldObject target = null;
Enum.GameObjectType targetType;
targetType = Enum.GameObjectType.values()[msg.getTargetType()];
@@ -56,11 +56,6 @@ public class AttackCmdMsgHandler extends AbstractClientMsgHandler {
case Building:
target = BuildingManager.getBuilding(msg.getTargetID());
break;
case NPC:
target = NPC.getNPC(msg.getTargetID());
break;
default:
return true;//cannot attack anything other than the 3 above
}
if(target == null) {
src/engine/net/client/handlers/MoveToPointHandler.java
+2 -28
View File
@@ -37,41 +37,15 @@ public class MoveToPointHandler extends AbstractClientMsgHandler {
Enum.GameObjectType targetType;
targetType = Enum.GameObjectType.values()[msg.getTargetType()];
switch(targetType){
case Building:
target = BuildingManager.getBuilding(msg.getTargetID());
int i = 1;
break;
case NPC:
target = NPC.getNPC(msg.getTargetID());
int j = 1;
break;
}
if(target != null) {
switch (target.getObjectType()) {
case Building:
target = BuildingManager.getBuilding(msg.getTargetID());
if (target == null) {
pc.teleport(pc.loc);
msg.setEndCoord(pc.loc);
origin.sendMsg(msg);
return true;// early exit for no building pulled
}
Building targetBuilding = (Building) target;
if (!targetBuilding.isVulnerable() || targetBuilding.getRank() < 0) {
pc.teleport(pc.loc);
msg.setEndCoord(pc.loc);
origin.sendMsg(msg);
return true;// cannot attack destroyed building or protected building
}
break;
case NPC:
pc.teleport(pc.loc);
msg.setEndCoord(pc.loc);
origin.sendMsg(msg);
return true;//cannot attack anything other than the 3 above
}
}
MovementManager.movement(msg, pc);
return true;
}