Project cleanup pre merge.

This commit is contained in:
2023-07-15 09:23:48 -04:00
parent 134b651df8
commit 9bbdef224d
747 changed files with 99704 additions and 101200 deletions
@@ -20,45 +20,42 @@ import engine.objects.PlayerCharacter;
import engine.objects.PlayerFriends;
public class RemoveFriendHandler extends AbstractClientMsgHandler {
public RemoveFriendHandler() {
super(RemoveFriendMessage.class);
}
public RemoveFriendHandler() {
super(RemoveFriendMessage.class);
}
@Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg,
ClientConnection origin) throws MsgSendException {
PlayerCharacter player = origin.getPlayerCharacter();
if (player == null)
return true;
public static void HandleRemoveFriend(PlayerCharacter player, RemoveFriendMessage msg) {
RemoveFriendMessage msg = (RemoveFriendMessage)baseMsg;
HandleRemoveFriend(player,msg);
return true;
}
//No friends in list. Early exit.
PlayerFriends.RemoveFromFriends(player.getObjectUUID(), msg.friendID);
PlayerFriends.RemoveFromFriends(msg.friendID, player.getObjectUUID());
Dispatch dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
msg = new RemoveFriendMessage(msg.friendID);
dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
}
@Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg,
ClientConnection origin) throws MsgSendException {
PlayerCharacter player = origin.getPlayerCharacter();
if (player == null)
return true;
RemoveFriendMessage msg = (RemoveFriendMessage) baseMsg;
HandleRemoveFriend(player, msg);
return true;
}
public static void HandleRemoveFriend(PlayerCharacter player, RemoveFriendMessage msg){
//No friends in list. Early exit.
PlayerFriends.RemoveFromFriends(player.getObjectUUID(), msg.friendID);
PlayerFriends.RemoveFromFriends(msg.friendID, player.getObjectUUID());
Dispatch dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
msg = new RemoveFriendMessage(msg.friendID);
dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
}
}