lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Addition of friendly command channel configuration.

Browse Source
This commit is contained in:
MobiusDevelopment 2020-04-30 21:46:27 +00:00
parent d6c62b24af
commit de8e676534
90 changed files with 810 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_1.0_Ertheia/dist/game/config/Character.ini vendored
View File

@ -640,6 +640,10 @@ AltPartyRange = 1500
# Default: False
AltLeavePartyLeader = False
# Consider same command channel members friends. (Used by target handlers.)
# Retail is supposed to be false, but have no proof that it is like that.
AltCommandChannelFriends = False
# ---------------------------------------------------------------------------
# Initial Settings:

12
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/Friend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -49,6 +51,16 @@ public class Friend implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/FriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -47,6 +49,16 @@ public class FriendPc implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,6 +60,16 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,6 +60,16 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

2
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/Config.java
View File

@ -264,6 +264,7 @@ public class Config
public static int ALT_PARTY_MAX_MEMBERS;
public static int ALT_PARTY_RANGE;
public static boolean ALT_LEAVE_PARTY_LEADER;
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
public static boolean INITIAL_EQUIPMENT_EVENT;
public static long STARTING_ADENA;
public static byte STARTING_LEVEL;
@ -1811,6 +1812,7 @@ public class Config
ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7);
ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1500);
ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false);
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
STARTING_ADENA = Character.getLong("StartingAdena", 0);
STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1);

4
L2J_Mobius_2.5_Underground/dist/game/config/Character.ini vendored
View File

@ -640,6 +640,10 @@ AltPartyRange = 1500
# Default: False
AltLeavePartyLeader = False
# Consider same command channel members friends. (Used by target handlers.)
# Retail is supposed to be false, but have no proof that it is like that.
AltCommandChannelFriends = False
# ---------------------------------------------------------------------------
# Initial Settings:

12
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/Friend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -50,6 +52,16 @@ public class Friend implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/FriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -48,6 +50,16 @@ public class FriendPc implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -59,6 +61,16 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -59,6 +61,16 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

2
L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java
View File

@ -270,6 +270,7 @@ public class Config
public static int ALT_PARTY_MAX_MEMBERS;
public static int ALT_PARTY_RANGE;
public static boolean ALT_LEAVE_PARTY_LEADER;
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
public static boolean INITIAL_EQUIPMENT_EVENT;
public static long STARTING_ADENA;
public static byte STARTING_LEVEL;
@ -1827,6 +1828,7 @@ public class Config
ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7);
ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1500);
ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false);
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
STARTING_ADENA = Character.getLong("StartingAdena", 0);
STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1);

4
L2J_Mobius_3.0_Helios/dist/game/config/Character.ini vendored
View File

@ -640,6 +640,10 @@ AltPartyRange = 1500
# Default: False
AltLeavePartyLeader = False
# Consider same command channel members friends. (Used by target handlers.)
# Retail is supposed to be false, but have no proof that it is like that.
AltCommandChannelFriends = False
# ---------------------------------------------------------------------------
# Initial Settings:

12
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/Friend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -50,6 +52,16 @@ public class Friend implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/FriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -48,6 +50,16 @@ public class FriendPc implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -59,6 +61,16 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -59,6 +61,16 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

2
L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java
View File

@ -270,6 +270,7 @@ public class Config
public static int ALT_PARTY_MAX_MEMBERS;
public static int ALT_PARTY_RANGE;
public static boolean ALT_LEAVE_PARTY_LEADER;
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
public static boolean INITIAL_EQUIPMENT_EVENT;
public static long STARTING_ADENA;
public static byte STARTING_LEVEL;
@ -1840,6 +1841,7 @@ public class Config
ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7);
ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1500);
ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false);
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
STARTING_ADENA = Character.getLong("StartingAdena", 0);
STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1);

4
L2J_Mobius_4.0_GrandCrusade/dist/game/config/Character.ini vendored
View File

@ -616,6 +616,10 @@ AltPartyRange = 1500
# Default: False
AltLeavePartyLeader = False
# Consider same command channel members friends. (Used by target handlers.)
# Retail is supposed to be false, but have no proof that it is like that.
AltCommandChannelFriends = False
# ---------------------------------------------------------------------------
# Initial Settings:

12
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/Friend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -49,6 +51,16 @@ public class Friend implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/FriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -47,6 +49,16 @@ public class FriendPc implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,6 +60,16 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,6 +60,16 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

2
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java
View File

@ -264,6 +264,7 @@ public class Config
public static int ALT_PARTY_MAX_MEMBERS;
public static int ALT_PARTY_RANGE;
public static boolean ALT_LEAVE_PARTY_LEADER;
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
public static boolean INITIAL_EQUIPMENT_EVENT;
public static long STARTING_ADENA;
public static byte STARTING_LEVEL;
@ -1821,6 +1822,7 @@ public class Config
ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7);
ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1500);
ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false);
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
STARTING_ADENA = Character.getLong("StartingAdena", 0);
STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1);

4
L2J_Mobius_5.0_Salvation/dist/game/config/Character.ini vendored
View File

@ -616,6 +616,10 @@ AltPartyRange = 1500
# Default: False
AltLeavePartyLeader = False
# Consider same command channel members friends. (Used by target handlers.)
# Retail is supposed to be false, but have no proof that it is like that.
AltCommandChannelFriends = False
# ---------------------------------------------------------------------------
# Initial Settings:

12
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/Friend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -49,6 +51,16 @@ public class Friend implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/FriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -47,6 +49,16 @@ public class FriendPc implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,6 +60,16 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,6 +60,16 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

2
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java
View File

@ -271,6 +271,7 @@ public class Config
public static int ALT_PARTY_MAX_MEMBERS;
public static int ALT_PARTY_RANGE;
public static boolean ALT_LEAVE_PARTY_LEADER;
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
public static boolean INITIAL_EQUIPMENT_EVENT;
public static long STARTING_ADENA;
public static byte STARTING_LEVEL;
@ -1822,6 +1823,7 @@ public class Config
ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7);
ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1500);
ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false);
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
STARTING_ADENA = Character.getLong("StartingAdena", 0);
STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1);

4
L2J_Mobius_5.5_EtinasFate/dist/game/config/Character.ini vendored
View File

@ -616,6 +616,10 @@ AltPartyRange = 1500
# Default: False
AltLeavePartyLeader = False
# Consider same command channel members friends. (Used by target handlers.)
# Retail is supposed to be false, but have no proof that it is like that.
AltCommandChannelFriends = False
# ---------------------------------------------------------------------------
# Initial Settings:

12
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/Friend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -49,6 +51,16 @@ public class Friend implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/FriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -47,6 +49,16 @@ public class FriendPc implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,6 +60,16 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,6 +60,16 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

2
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/Config.java
View File

@ -271,6 +271,7 @@ public class Config
public static int ALT_PARTY_MAX_MEMBERS;
public static int ALT_PARTY_RANGE;
public static boolean ALT_LEAVE_PARTY_LEADER;
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
public static boolean INITIAL_EQUIPMENT_EVENT;
public static long STARTING_ADENA;
public static byte STARTING_LEVEL;
@ -1829,6 +1830,7 @@ public class Config
ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7);
ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1500);
ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false);
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
STARTING_ADENA = Character.getLong("StartingAdena", 0);
STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1);

4
L2J_Mobius_6.0_Fafurion/dist/game/config/Character.ini vendored
View File

@ -636,6 +636,10 @@ AltPartyRange = 1500
# Default: False
AltLeavePartyLeader = False
# Consider same command channel members friends. (Used by target handlers.)
# Retail is supposed to be false, but have no proof that it is like that.
AltCommandChannelFriends = False
# ---------------------------------------------------------------------------
# Initial Settings:

12
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/Friend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -49,6 +51,16 @@ public class Friend implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/FriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -47,6 +49,16 @@ public class FriendPc implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,6 +60,16 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,6 +60,16 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

2
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/Config.java
View File

@ -272,6 +272,7 @@ public class Config
public static int ALT_PARTY_MAX_MEMBERS;
public static int ALT_PARTY_RANGE;
public static boolean ALT_LEAVE_PARTY_LEADER;
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
public static boolean INITIAL_EQUIPMENT_EVENT;
public static long STARTING_ADENA;
public static byte STARTING_LEVEL;
@ -1868,6 +1869,7 @@ public class Config
ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7);
ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1500);
ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false);
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
STARTING_ADENA = Character.getLong("StartingAdena", 0);
STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1);

4
L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Character.ini vendored
View File

@ -646,6 +646,10 @@ AltPartyRange = 1500
# Default: False
AltLeavePartyLeader = False
# Consider same command channel members friends. (Used by target handlers.)
# Retail is supposed to be false, but have no proof that it is like that.
AltCommandChannelFriends = False
# ---------------------------------------------------------------------------
# Initial Settings:

12
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/Friend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -49,6 +51,16 @@ public class Friend implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/FriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -47,6 +49,16 @@ public class FriendPc implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,6 +60,16 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,6 +60,16 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

2
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/Config.java
View File

@ -273,6 +273,7 @@ public class Config
public static int ALT_PARTY_MAX_MEMBERS;
public static int ALT_PARTY_RANGE;
public static boolean ALT_LEAVE_PARTY_LEADER;
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
public static boolean INITIAL_EQUIPMENT_EVENT;
public static long STARTING_ADENA;
public static byte STARTING_LEVEL;
@ -1880,6 +1881,7 @@ public class Config
ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7);
ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1500);
ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false);
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
STARTING_ADENA = Character.getLong("StartingAdena", 0);
STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1);

4
L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Character.ini vendored
View File

@ -557,6 +557,10 @@ AltPartyRange = 1500
# Default: False
AltLeavePartyLeader = False
# Consider same command channel members friends. (Used by target handlers.)
# Retail is supposed to be false, but have no proof that it is like that.
AltCommandChannelFriends = False
# ---------------------------------------------------------------------------
# Initial Settings:

12
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/Friend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -49,6 +51,16 @@ public class Friend implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/FriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -47,6 +49,16 @@ public class FriendPc implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,6 +60,16 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,6 +60,16 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

2
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java
View File

@ -269,6 +269,7 @@ public class Config
public static int ALT_PARTY_MAX_MEMBERS;
public static int ALT_PARTY_RANGE;
public static boolean ALT_LEAVE_PARTY_LEADER;
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
public static boolean INITIAL_EQUIPMENT_EVENT;
public static long STARTING_ADENA;
public static byte STARTING_LEVEL;
@ -1735,6 +1736,7 @@ public class Config
ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7);
ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1500);
ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false);
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
STARTING_ADENA = Character.getLong("StartingAdena", 0);
STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1);

4
L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Character.ini vendored
View File

@ -557,6 +557,10 @@ AltPartyRange = 1500
# Default: False
AltLeavePartyLeader = False
# Consider same command channel members friends. (Used by target handlers.)
# Retail is supposed to be false, but have no proof that it is like that.
AltCommandChannelFriends = False
# ---------------------------------------------------------------------------
# Initial Settings:

12
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/Friend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -49,6 +51,16 @@ public class Friend implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/FriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -47,6 +49,16 @@ public class FriendPc implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,6 +60,16 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,6 +60,16 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

2
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/Config.java
View File

@ -269,6 +269,7 @@ public class Config
public static int ALT_PARTY_MAX_MEMBERS;
public static int ALT_PARTY_RANGE;
public static boolean ALT_LEAVE_PARTY_LEADER;
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
public static boolean INITIAL_EQUIPMENT_EVENT;
public static long STARTING_ADENA;
public static byte STARTING_LEVEL;
@ -1739,6 +1740,7 @@ public class Config
ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7);
ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1500);
ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false);
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
STARTING_ADENA = Character.getLong("StartingAdena", 0);
STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1);

4
L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Character.ini vendored
View File

@ -557,6 +557,10 @@ AltPartyRange = 1500
# Default: False
AltLeavePartyLeader = False
# Consider same command channel members friends. (Used by target handlers.)
# Retail is supposed to be false, but have no proof that it is like that.
AltCommandChannelFriends = False
# ---------------------------------------------------------------------------
# Initial Settings:

12
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/Friend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -49,6 +51,16 @@ public class Friend implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/FriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -47,6 +49,16 @@ public class FriendPc implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,6 +60,16 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,6 +60,16 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

2
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/Config.java
View File

@ -269,6 +269,7 @@ public class Config
public static int ALT_PARTY_MAX_MEMBERS;
public static int ALT_PARTY_RANGE;
public static boolean ALT_LEAVE_PARTY_LEADER;
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
public static boolean INITIAL_EQUIPMENT_EVENT;
public static long STARTING_ADENA;
public static byte STARTING_LEVEL;
@ -1739,6 +1740,7 @@ public class Config
ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7);
ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1500);
ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false);
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
STARTING_ADENA = Character.getLong("StartingAdena", 0);
STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1);

4
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Character.ini vendored
View File

@ -557,6 +557,10 @@ AltPartyRange = 1500
# Default: False
AltLeavePartyLeader = False
# Consider same command channel members friends. (Used by target handlers.)
# Retail is supposed to be false, but have no proof that it is like that.
AltCommandChannelFriends = False
# ---------------------------------------------------------------------------
# Initial Settings:

12
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/Friend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -49,6 +51,16 @@ public class Friend implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/FriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -47,6 +49,16 @@ public class FriendPc implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,6 +60,16 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,6 +60,16 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

2
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/Config.java
View File

@ -269,6 +269,7 @@ public class Config
public static int ALT_PARTY_MAX_MEMBERS;
public static int ALT_PARTY_RANGE;
public static boolean ALT_LEAVE_PARTY_LEADER;
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
public static boolean INITIAL_EQUIPMENT_EVENT;
public static long STARTING_ADENA;
public static byte STARTING_LEVEL;
@ -1740,6 +1741,7 @@ public class Config
ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7);
ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1500);
ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false);
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
STARTING_ADENA = Character.getLong("StartingAdena", 0);
STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1);

4
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/config/Character.ini vendored
View File

@ -573,6 +573,10 @@ AltPartyRange = 1500
# Default: False
AltLeavePartyLeader = False
# Consider same command channel members friends. (Used by target handlers.)
# Retail is supposed to be false, but have no proof that it is like that.
AltCommandChannelFriends = False
# ---------------------------------------------------------------------------
# Initial Settings:

12
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/Friend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -49,6 +51,16 @@ public class Friend implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/FriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -47,6 +49,16 @@ public class FriendPc implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,6 +60,16 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,6 +60,16 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

2
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/Config.java
View File

@ -269,6 +269,7 @@ public class Config
public static int ALT_PARTY_MAX_MEMBERS;
public static int ALT_PARTY_RANGE;
public static boolean ALT_LEAVE_PARTY_LEADER;
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
public static boolean INITIAL_EQUIPMENT_EVENT;
public static long STARTING_ADENA;
public static byte STARTING_LEVEL;
@ -1749,6 +1750,7 @@ public class Config
ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7);
ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1500);
ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false);
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
STARTING_ADENA = Character.getLong("StartingAdena", 0);
STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1);

4
L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Character.ini vendored
View File

@ -573,6 +573,10 @@ AltPartyRange = 1500
# Default: False
AltLeavePartyLeader = False
# Consider same command channel members friends. (Used by target handlers.)
# Retail is supposed to be false, but have no proof that it is like that.
AltCommandChannelFriends = False
# ---------------------------------------------------------------------------
# Initial Settings:

12
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/Friend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -49,6 +51,16 @@ public class Friend implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/FriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -47,6 +49,16 @@ public class FriendPc implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,6 +60,16 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,6 +60,16 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

2
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java
View File

@ -270,6 +270,7 @@ public class Config
public static int ALT_PARTY_MAX_MEMBERS;
public static int ALT_PARTY_RANGE;
public static boolean ALT_LEAVE_PARTY_LEADER;
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
public static boolean INITIAL_EQUIPMENT_EVENT;
public static long STARTING_ADENA;
public static byte STARTING_LEVEL;
@ -1756,6 +1757,7 @@ public class Config
ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7);
ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1500);
ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false);
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
STARTING_ADENA = Character.getLong("StartingAdena", 0);
STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1);

4
L2J_Mobius_Classic_Interlude/dist/game/config/Character.ini vendored
View File

@ -557,6 +557,10 @@ AltPartyRange = 1500
# Default: False
AltLeavePartyLeader = False
# Consider same command channel members friends. (Used by target handlers.)
# Retail is supposed to be false, but have no proof that it is like that.
AltCommandChannelFriends = False
# ---------------------------------------------------------------------------
# Initial Settings:

12
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/Friend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -49,6 +51,16 @@ public class Friend implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/FriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -47,6 +49,16 @@ public class FriendPc implements IAffectObjectHandler
return true;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return true;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,6 +60,16 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

12
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java vendored
View File

@ -16,7 +16,9 @@
*/
package handlers.targethandlers.affectobject;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -58,6 +60,16 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
if (Config.ALT_COMMAND_CHANNEL_FRIENDS)
{
final CommandChannel playerCC = player.getCommandChannel();
final CommandChannel targetCC = targetPlayer.getCommandChannel();
if ((playerCC != null) && (targetCC != null) && (playerCC.getLeaderObjectId() == targetCC.getLeaderObjectId()))
{
return false;
}
}
// Party (command channel doesn't make you friends).
final Party party = player.getParty();
final Party targetParty = targetPlayer.getParty();

2
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java
View File

@ -270,6 +270,7 @@ public class Config
public static int ALT_PARTY_MAX_MEMBERS;
public static int ALT_PARTY_RANGE;
public static boolean ALT_LEAVE_PARTY_LEADER;
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
public static boolean INITIAL_EQUIPMENT_EVENT;
public static long STARTING_ADENA;
public static byte STARTING_LEVEL;
@ -1753,6 +1754,7 @@ public class Config
ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7);
ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1500);
ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false);
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
STARTING_ADENA = Character.getLong("StartingAdena", 0);
STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1);