forked from MagicBane/Server
DispatchManager is now an official manager singleton.
This commit is contained in:
@@ -3,6 +3,7 @@ package engine.net.client.handlers;
|
||||
import engine.exception.MsgSendException;
|
||||
import engine.gameManager.BuildingManager;
|
||||
import engine.gameManager.DbManager;
|
||||
import engine.gameManager.DispatchManager;
|
||||
import engine.gameManager.SessionManager;
|
||||
import engine.math.FastMath;
|
||||
import engine.math.Vector3fImmutable;
|
||||
@@ -11,7 +12,6 @@ import engine.mbEnums.DispatchChannel;
|
||||
import engine.mbEnums.GameObjectType;
|
||||
import engine.mbEnums.ProfitType;
|
||||
import engine.net.Dispatch;
|
||||
import engine.net.DispatchMessage;
|
||||
import engine.net.client.ClientConnection;
|
||||
import engine.net.client.msg.*;
|
||||
import engine.objects.*;
|
||||
@@ -429,7 +429,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
|
||||
manageCityAssetsMsg.setTargetID(building.getObjectUUID());
|
||||
|
||||
Dispatch dispatch = Dispatch.borrow(player, manageCityAssetsMsg);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
|
||||
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
|
||||
|
||||
return true;
|
||||
|
||||
@@ -452,7 +452,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
|
||||
outMsg.setUnknown54(1);
|
||||
|
||||
dispatch = Dispatch.borrow(player, outMsg);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
|
||||
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
|
||||
|
||||
break;
|
||||
case CLIENT_REDEED_REQUEST:
|
||||
@@ -472,7 +472,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
|
||||
|
||||
modifySellProfit(orderNPCMsg, origin);
|
||||
dispatch = Dispatch.borrow(player, orderNPCMsg);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
|
||||
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
|
||||
return true;
|
||||
case 10:
|
||||
case 11:
|
||||
@@ -483,7 +483,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
|
||||
|
||||
modifyBuyProfit(orderNPCMsg, origin);
|
||||
dispatch = Dispatch.borrow(player, orderNPCMsg);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
|
||||
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -494,7 +494,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
|
||||
|
||||
ManageNPCMsg manageNPCMsg = new ManageNPCMsg(npc);
|
||||
Dispatch dispatch = Dispatch.borrow(player, manageNPCMsg);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
|
||||
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
|
||||
return true;
|
||||
|
||||
} else if (orderNPCMsg.getObjectType() == GameObjectType.Mob.ordinal()) {
|
||||
@@ -535,7 +535,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
|
||||
manageCityAssetsMsg.setTargetType(building.getObjectType().ordinal());
|
||||
manageCityAssetsMsg.setTargetID(building.getObjectUUID());
|
||||
Dispatch dispatch = Dispatch.borrow(player, manageCityAssetsMsg);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
|
||||
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
|
||||
break;
|
||||
case 3:
|
||||
|
||||
@@ -556,7 +556,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
|
||||
outMsg.setUnknown54(1);
|
||||
|
||||
dispatch = Dispatch.borrow(player, outMsg);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
|
||||
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
|
||||
break;
|
||||
case 6:
|
||||
|
||||
@@ -583,7 +583,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
|
||||
|
||||
ManageNPCMsg manageNPCMsg = new ManageNPCMsg(mob);
|
||||
Dispatch dispatch = Dispatch.borrow(player, manageNPCMsg);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
|
||||
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user