Changeset 1512

(2010/03/14 03:53) Almost 2 years ago

[PlayerSettings] added denied status with messages (you can deny view details, request friend, invite legion & party, exchange, duel)

Affected files

trunk/AE-go_GameServer/src/com/aionemu/gameserver/model/gameobjects/player/DeniedStatus.java

Show contents

trunk/AE-go_GameServer/src/com/aionemu/gameserver/model/gameobjects/player/PlayerSettings.java Download diff

  */
 package com.aionemu.gameserver.model.gameobjects.player;
+import com.aionemu.gameserver.model.gameobjects.player.DeniedStatus;
 import com.aionemu.gameserver.model.gameobjects.PersistentState;
 /**
 	{
 		return uiSettings;
 	}
 	/**
 	 * @param uiSettings the uiSettings to set
 	 */
 		this.uiSettings = uiSettings;
 		persistentState = PersistentState.UPDATE_REQUIRED;
 	}
 	/**
 	 * @return the shortcuts
 	 */
 	{
 		return shortcuts;
 	}
 	/**
 	 * @param shortcuts the shortcuts to set
 	 */
 		this.shortcuts = shortcuts;
 		persistentState = PersistentState.UPDATE_REQUIRED;
 	}
 	/**
-	 * @return the deny
+	 * @return the display
 	 */
-	public int getDeny()
+	public int getDisplay()
 	{
-		return deny;
+		return display;
 	}
 	/**
-	 * @param deny the deny to set
+	 * @param display the display to set
 	 */
-	public void setDeny(int deny)
+	public void setDisplay(int display)
 	{
-		this.deny = deny;
+		this.display = display;
 		persistentState = PersistentState.UPDATE_REQUIRED;
 	}
 	/**
-	 * @return the display
+	 * @return the deny
 	 */
-	public int getDisplay()
+	public int getDeny()
 	{
-		return display;
+		return deny;
 	}
 	/**
-	 * @param display the display to set
+	 * @param deny the deny to set
 	 */
-	public void setDisplay(int display)
+	public void setDeny(int deny)
 	{
-		this.display = display;
+		this.deny = deny;
 		persistentState = PersistentState.UPDATE_REQUIRED;
 	}
+	public boolean isInDeniedStatus(DeniedStatus deny)
+	{
+		int isDeniedStatus = this.deny & deny.getId();
+		if(isDeniedStatus == deny.getId())
+			return true;
+		return false;
+	}
 }

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_CUSTOM_SETTINGS.java Download diff

	1511		1512
1	/*	1	/*
2	* This file is part of aion-unique <aion-unique.org>.	2	* This file is part of aion-unique <aion-unique.org>.
3	*	3	*
4	* Aion-unique is free software: you can redistribute it and/or modify	4	* aion-unique is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by	5	* it under the terms of the GNU General Public License as published by
6	* the Free Software Foundation, either version 3 of the License, or	6	* the Free Software Foundation, either version 3 of the License, or
7	* (at your option) any later version.	7	* (at your option) any later version.
8	*	8	*
9	* Aion-unique is distributed in the hope that it will be useful,	9	* aion-unique is distributed in the hope that it will be useful,
10	* but WITHOUT ANY WARRANTY; without even the implied warranty of	10	* but WITHOUT ANY WARRANTY; without even the implied warranty of
11	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	11	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12	* GNU General Public License for more details.	12	* GNU General Public License for more details.
13	*	13	*
14	* You should have received a copy of the GNU General Public License	14	* You should have received a copy of the GNU General Public License
15	* along with aion-unique. If not, see <http://www.gnu.org/licenses/>.	15	* along with aion-unique. If not, see <http://www.gnu.org/licenses/>.
16	*/	16	*/
17	package com.aionemu.gameserver.network.aion.clientpackets;	17	package com.aionemu.gameserver.network.aion.clientpackets;
18		18

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_DUEL_REQUEST.java Download diff

 package com.aionemu.gameserver.network.aion.clientpackets;
 import com.aionemu.gameserver.model.gameobjects.AionObject;
+import com.aionemu.gameserver.model.gameobjects.player.DeniedStatus;
 import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.network.aion.AionClientPacket;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_SYSTEM_MESSAGE;
 		if(target instanceof Player)
 		{
 			Player targetPlayer = (Player) target;
+			if(targetPlayer.getPlayerSettings().isInDeniedStatus(DeniedStatus.DUEL))
+			{
+				sendPacket(SM_SYSTEM_MESSAGE.STR_MSG_REJECTED_DUEL(targetPlayer.getName()));
+				return;
+			}
 			duelService.onDuelRequest(activePlayer, targetPlayer);
 			duelService.confirmDuelWith(activePlayer, targetPlayer);
 		}

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_EXCHANGE_REQUEST.java Download diff

 package com.aionemu.gameserver.network.aion.clientpackets;
 import com.aionemu.gameserver.model.gameobjects.Creature;
+import com.aionemu.gameserver.model.gameobjects.player.DeniedStatus;
 import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.gameobjects.player.RequestResponseHandler;
 import com.aionemu.gameserver.network.aion.AionClientPacket;
 			 */
 			if (targetPlayer!=null)
 			{
+				if(targetPlayer.getPlayerSettings().isInDeniedStatus(DeniedStatus.TRADE))
+				{
+					sendPacket(SM_SYSTEM_MESSAGE.STR_MSG_REJECTED_TRADE(targetPlayer.getName()));
+					return;
+				}
 				sendPacket(SM_SYSTEM_MESSAGE.REQUEST_TRADE(targetPlayer.getName()));
 				RequestResponseHandler responseHandler = new RequestResponseHandler(activePlayer){

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_FRIEND_ADD.java Download diff

 package com.aionemu.gameserver.network.aion.clientpackets;
 import com.aionemu.gameserver.model.gameobjects.Creature;
+import com.aionemu.gameserver.model.gameobjects.player.DeniedStatus;
 import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.gameobjects.player.RequestResponseHandler;
 import com.aionemu.gameserver.network.aion.AionClientPacket;
 					{
 						return;
 					}
 					else
 					{
 						socialService.makeFriends((Player)requester, responder);
 			}
 			else
 			{
+				if(targetPlayer.getPlayerSettings().isInDeniedStatus(DeniedStatus.FRIEND))
+				{
+					sendPacket(SM_SYSTEM_MESSAGE.STR_MSG_REJECTED_FRIEND(targetPlayer.getName()));
+					return;
+				}
 				//Send question packet to buddy
 				targetPlayer.getClientConnection()
 					.sendPacket(new SM_QUESTION_WINDOW(SM_QUESTION_WINDOW.STR_BUDDYLIST_ADD_BUDDY_REQUETS, activePlayer.getObjectId(), activePlayer.getName()));

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_INVITE_TO_GROUP.java Download diff

  */
 package com.aionemu.gameserver.network.aion.clientpackets;
+import com.aionemu.gameserver.model.gameobjects.player.DeniedStatus;
 import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.network.aion.AionClientPacket;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_SYSTEM_MESSAGE;
 		final Player invited = world.findPlayer(playerName);
 		if(invited != null)
+		{
+			if(invited.getPlayerSettings().isInDeniedStatus(DeniedStatus.GROUP))
+			{
+				sendPacket(SM_SYSTEM_MESSAGE.STR_MSG_REJECTED_INVITE_PARTY(invited.getName()));
+				return;
+			}
 			groupService.invitePlayerToGroup(inviter, invited);
+		}
 		else
 			inviter.getClientConnection().sendPacket(SM_SYSTEM_MESSAGE.PLAYER_IS_OFFLINE(name));
 	}

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_LEGION.java Download diff

 import org.apache.log4j.Logger;
+import com.aionemu.gameserver.model.gameobjects.player.DeniedStatus;
 import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.legion.Legion;
 import com.aionemu.gameserver.model.legion.LegionMemberEx;
 					case 0x01:
 						if(targetPlayer != null)
 						{
+							if(targetPlayer.getPlayerSettings().isInDeniedStatus(DeniedStatus.GUILD))
+							{
+								sendPacket(SM_SYSTEM_MESSAGE.STR_MSG_REJECTED_INVITE_GUILD(targetPlayer.getName()));
+								return;
+							}
 							legionService.invitePlayerToLegion(activePlayer, targetPlayer);
 						}
 						else

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_VIEW_PLAYER_DETAILS.java Download diff

 import org.apache.log4j.Logger;
+import com.aionemu.gameserver.model.gameobjects.player.DeniedStatus;
 import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.network.aion.AionClientPacket;
+import com.aionemu.gameserver.network.aion.serverpackets.SM_SYSTEM_MESSAGE;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_VIEW_PLAYER_DETAILS;
 import com.aionemu.gameserver.world.World;
 import com.google.inject.Inject;
 			return;
 		}
+		if(player.getPlayerSettings().isInDeniedStatus(DeniedStatus.VEIW_DETAIL))
+		{
+			sendPacket(SM_SYSTEM_MESSAGE.STR_MSG_REJECTED_WATCH(player.getName()));
+			return;
+		}
 		sendPacket(new SM_VIEW_PLAYER_DETAILS(player.getEquipment().getEquippedItems()));
 	}
 }

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/serverpackets/SM_SYSTEM_MESSAGE.java Download diff

	1511		1512
831	return new SM_SYSTEM_MESSAGE(1390221, nameId);	831	return new SM_SYSTEM_MESSAGE(1390221, nameId);
832	}	832	}
833		833
		834	/**
		835	* Deny messages
		836	*/
		837	public static SM_SYSTEM_MESSAGE STR_MSG_REJECTED_WATCH(String charName)
		838	{
		839	return new SM_SYSTEM_MESSAGE(1390114, charName);
		840	}
		841
		842	public static SM_SYSTEM_MESSAGE STR_MSG_REJECTED_TRADE(String charName)
		843	{
		844	return new SM_SYSTEM_MESSAGE(1390115, charName);
		845	}
		846
		847	public static SM_SYSTEM_MESSAGE STR_MSG_REJECTED_INVITE_PARTY(String charName)
		848	{
		849	return new SM_SYSTEM_MESSAGE(1390116, charName);
		850	}
		851
		852	public static SM_SYSTEM_MESSAGE STR_MSG_REJECTED_INVITE_FORCE(String charName)
		853	{
		854	return new SM_SYSTEM_MESSAGE(1390117, charName);
		855	}
		856
		857	public static SM_SYSTEM_MESSAGE STR_MSG_REJECTED_INVITE_GUILD(String charName)
		858	{
		859	return new SM_SYSTEM_MESSAGE(1390118, charName);
		860	}
		861
		862	public static SM_SYSTEM_MESSAGE STR_MSG_REJECTED_FRIEND(String charName)
		863	{
		864	return new SM_SYSTEM_MESSAGE(1390119, charName);
		865	}
		866
		867	public static SM_SYSTEM_MESSAGE STR_MSG_REJECTED_DUEL(String charName)
		868	{
		869	return new SM_SYSTEM_MESSAGE(1390120, charName);
		870	}
		871
834	private final int code;	872	private final int code;
835	private final Object[] params;	873	private final Object[] params;
836		874

trunk/AE-go_GameServer/src/com/aionemu/gameserver/skillengine/effect/OpenAerialEffect.java Download diff

	1511		1512
34	@XmlType(name = "OpenAerialEffect")	34	@XmlType(name = "OpenAerialEffect")
35	public class OpenAerialEffect extends EffectTemplate	35	public class OpenAerialEffect extends EffectTemplate
36	{	36	{
37
38	@Override	37	@Override
39	public void applyEffect(Effect effect)	38	public void applyEffect(Effect effect)
40	{	39	{
...		...
53	{	52	{
54	final Creature effected = effect.getEffected();	53	final Creature effected = effect.getEffected();
55	effected.getEffectController().setAbnormal(EffectId.OPENAERIAL.getEffectId());	54	effected.getEffectController().setAbnormal(EffectId.OPENAERIAL.getEffectId());
56	PacketSendUtility.broadcastPacketAndReceive(effect.getEffected(), new SM_FORCED_MOVE(effect.getEffector(), effect.getEffected()));	55	PacketSendUtility.broadcastPacketAndReceive(effected, new SM_FORCED_MOVE(effect.getEffector(), effected));
57	}	56	}
58		57
59	@Override	58	@Override
60	public void endEffect(Effect effect)	59	public void endEffect(Effect effect)
61	{	60	{
62	effect.getEffected().getEffectController().unsetAbnormal(EffectId.OPENAERIAL.getEffectId());	61	effect.getEffected().getEffectController().unsetAbnormal(EffectId.OPENAERIAL.getEffectId());
63	}	62	}
64
65
66	}	63	}

trunk/AE-go_GameServer/src/com/aionemu/gameserver/skillengine/effect/StumbleEffect.java Download diff

 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
+import com.aionemu.gameserver.model.gameobjects.Creature;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_FORCED_MOVE;
 import com.aionemu.gameserver.skillengine.model.Effect;
 import com.aionemu.gameserver.skillengine.model.SpellStatus;
 	@Override
 	public void startEffect(Effect effect)
 	{
-		effect.getEffected().getEffectController().setAbnormal(EffectId.STUMBLE.getEffectId());
+		final Creature effected = effect.getEffected();
-		PacketSendUtility.broadcastPacketAndReceive(effect.getEffected(), new SM_FORCED_MOVE(effect.getEffector(), effect.getEffected()));
+		effected.getEffectController().setAbnormal(EffectId.STUMBLE.getEffectId());
+		PacketSendUtility.broadcastPacketAndReceive(effected, new SM_FORCED_MOVE(effect.getEffector(), effected));
 	}
 	@Override