Project cleanup pre merge.

2023-07-15 09:23:48 -04:00
parent 134b651df8
commit 9bbdef224d
747 changed files with 99704 additions and 101200 deletions
@@ -25,54 +25,52 @@ import engine.objects.PlayerFriends;

 public class FriendAcceptHandler extends AbstractClientMsgHandler {

-	public FriendAcceptHandler() {
-		super(AcceptFriendMsg.class);
-	}
+    public FriendAcceptHandler() {
+        super(AcceptFriendMsg.class);
+    }

-	@Override
-	protected boolean _handleNetMsg(ClientNetMsg baseMsg,
-			ClientConnection origin) throws MsgSendException {
-		
-		PlayerCharacter player = origin.getPlayerCharacter();
-		
-		if (player == null)
-			return true;
-		
+    //change to Request
+    public static void HandleAcceptFriend(PlayerCharacter player, AcceptFriendMsg msg) {
+        PlayerCharacter sourceFriend = SessionManager.getPlayerCharacterByLowerCaseName(msg.sourceName);

-		AcceptFriendMsg msg = (AcceptFriendMsg)baseMsg;
-		
-		
-			HandleAcceptFriend(player,msg);
-			
-		return true;
-	}
-	
+        if (sourceFriend == null) {
+            ErrorPopupMsg.sendErrorMsg(player, "Could not find player " + msg.sourceName);
+            return;
+        }
+
+        PlayerFriends.AddToFriends(sourceFriend.getObjectUUID(), player.getObjectUUID());
+        PlayerFriends.AddToFriends(player.getObjectUUID(), sourceFriend.getObjectUUID());
+
+
+        AddFriendMessage outMsg = new AddFriendMessage(player);
+
+        Dispatch dispatch = Dispatch.borrow(sourceFriend, outMsg);
+        DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
+
+        outMsg = new AddFriendMessage(sourceFriend);
+        dispatch = Dispatch.borrow(player, outMsg);
+        DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
+
+        ChatManager.chatSystemInfo(sourceFriend, player.getFirstName() + " has agreed to be your friend.");
+
+    }
+
+    @Override
+    protected boolean _handleNetMsg(ClientNetMsg baseMsg,
+                                    ClientConnection origin) throws MsgSendException {
+
+        PlayerCharacter player = origin.getPlayerCharacter();
+
+        if (player == null)
+            return true;
+
+
+        AcceptFriendMsg msg = (AcceptFriendMsg) baseMsg;
+
+
+        HandleAcceptFriend(player, msg);
+
+        return true;
+    }

-	
-	//change to Request
-	public static void HandleAcceptFriend(PlayerCharacter player, AcceptFriendMsg msg){
-	PlayerCharacter sourceFriend = SessionManager.getPlayerCharacterByLowerCaseName(msg.sourceName);
-	
-	if (sourceFriend == null){
-		ErrorPopupMsg.sendErrorMsg(player, "Could not find player " + msg.sourceName);
-		return;
-	}
-	
-	PlayerFriends.AddToFriends(sourceFriend.getObjectUUID(), player.getObjectUUID());
-	PlayerFriends.AddToFriends(player.getObjectUUID(), sourceFriend.getObjectUUID());
-	
-	
-	AddFriendMessage outMsg = new AddFriendMessage(player);
-	
-	Dispatch dispatch = Dispatch.borrow(sourceFriend, outMsg);
-	DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
-	
-	outMsg = new AddFriendMessage(sourceFriend);
-	 dispatch = Dispatch.borrow(player, outMsg);
-	DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
-	
-	ChatManager.chatSystemInfo(sourceFriend, player.getFirstName() + " has agreed to be your friend.");
-	
-	}
-	
 }