Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- ### Eclipse Workspace Patch 1.0
- #P L2J_DataPack_BETA
- Index: data/scripts/handlers/chathandlers/ChatTell.java
- ===================================================================
- --- data/scripts/handlers/chathandlers/ChatTell.java (revision 213)
- +++ data/scripts/handlers/chathandlers/ChatTell.java (working copy)
- @@ -63,7 +63,7 @@
- receiver = L2World.getInstance().getPlayer(target);
- - if (receiver != null && !receiver.isSilenceMode())
- + if (receiver != null && !receiver.isSilenceMode(activeChar.getObjectId()))
- {
- if (Config.JAIL_DISABLE_CHAT && receiver.isInJail() && !activeChar.isGM())
- {
- @@ -82,6 +82,10 @@
- }
- if (!BlockList.isBlocked(receiver, activeChar))
- {
- + // Allow reciever to send PMs to this char, which is in silence mode.
- + if (Config.SILENCE_MODE_EXCLUDE && activeChar.isSilenceMode())
- + activeChar.addSilenceModeExcluded(receiver.getObjectId());
- +
- receiver.sendPacket(cs);
- activeChar.sendPacket(new CreatureSay(activeChar.getObjectId(), type, "->" + receiver.getName(), text));
- }
- #P L2J_Server_BETA
- Index: dist/game/config/Character.properties
- ===================================================================
- --- dist/game/config/Character.properties (revision 128)
- +++ dist/game/config/Character.properties (working copy)
- @@ -777,4 +777,9 @@
- # Character name restriction
- # Disallow characters to have a name which contains the words.
- # Split them with ",". Example: announcements,announce...
- -ForbiddenNames = annou,ammou,amnou,anmou,anou,amou
- \ No newline at end of file
- +ForbiddenNames = annou,ammou,amnou,anmou,anou,amou
- +
- +# If enabled, when character in silence (block PMs) mode sends a PM to a character, silence mode no longer blocks this character,
- +# allowing both characters send each other PMs even with enabled silence mode.
- +# The exclude list is cleared each time the character goes into silence mode.
- +SilenceModeExclude = False
- \ No newline at end of file
- Index: java/com/l2jserver/gameserver/communitybbs/Manager/RegionBBSManager.java
- ===================================================================
- --- java/com/l2jserver/gameserver/communitybbs/Manager/RegionBBSManager.java (revision 128)
- +++ java/com/l2jserver/gameserver/communitybbs/Manager/RegionBBSManager.java (working copy)
- @@ -227,7 +227,7 @@
- _logChat.log(record);
- }
- CreatureSay cs = new CreatureSay(activeChar.getObjectId(), Say2.TELL, activeChar.getName(), ar3);
- - if (!receiver.isSilenceMode() && !BlockList.isBlocked(receiver, activeChar) )
- + if (!receiver.isSilenceMode(activeChar.getObjectId()) && !BlockList.isBlocked(receiver, activeChar) )
- {
- receiver.sendPacket(cs);
- activeChar.sendPacket(new CreatureSay(activeChar.getObjectId(), Say2.TELL, "->" + receiver.getName(), ar3));
- Index: java/com/l2jserver/Config.java
- ===================================================================
- --- java/com/l2jserver/Config.java (revision 128)
- +++ java/com/l2jserver/Config.java (working copy)
- @@ -230,6 +230,7 @@
- public static boolean STORE_RECIPE_SHOPLIST;
- public static boolean STORE_UI_SETTINGS;
- public static String[] FORBIDDEN_NAMES;
- + public static boolean SILENCE_MODE_EXCLUDE;
- //--------------------------------------------------
- // ClanHall Settings
- @@ -1872,6 +1873,7 @@
- STORE_RECIPE_SHOPLIST = Boolean.parseBoolean(Character.getProperty("StoreRecipeShopList", "False"));
- STORE_UI_SETTINGS = Boolean.parseBoolean(Character.getProperty("StoreCharUiSettings", "False"));
- FORBIDDEN_NAMES = Character.getProperty("ForbiddenNames", "").split(",");
- + SILENCE_MODE_EXCLUDE = Boolean.parseBoolean(Character.getProperty("SilenceModeExclude", "False"));
- PLAYER_MOVEMENT_BLOCK_TIME = Integer.parseInt(Character.getProperty("NpcTalkBlockingTime", "0")) * 1000;
- }
- catch (Exception e)
- Index: java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
- ===================================================================
- --- java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java (revision 129)
- +++ java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java (working copy)
- @@ -14,6 +14,8 @@
- */
- package com.l2jserver.gameserver.model.actor.instance;
- +import gnu.trove.TIntArrayList;
- +
- import java.io.BufferedWriter;
- import java.io.File;
- import java.io.FileWriter;
- @@ -676,6 +678,7 @@
- private boolean _messageRefusal = false; // message refusal mode
- private boolean _silenceMode = false; // silence mode
- + private TIntArrayList _silenceModeExcluded = new TIntArrayList(); // silence mode
- private boolean _dietMode = false; // ignore weight penalty
- private boolean _tradeRefusal = false; // Trade refusal
- private boolean _exchangeRefusal = false; // Exchange refusal
- @@ -14617,14 +14620,31 @@
- }
- /**
- + * While at silenceMode, checks if this PC Instance blocks PMs for this user
- + */
- + public boolean isSilenceMode(int objId)
- + {
- + if (Config.SILENCE_MODE_EXCLUDE && _silenceMode)
- + return !_silenceModeExcluded.contains(objId);
- +
- + return _silenceMode;
- + }
- +
- + /**
- * @param mode the _silenceMode to set
- */
- public void setSilenceMode(boolean mode)
- {
- _silenceMode = mode;
- + _silenceModeExcluded.clear(); // Clear the excluded list on each setSilenceMode
- sendPacket(new EtcStatusUpdate(this));
- }
- + public void addSilenceModeExcluded(int playerObjId)
- + {
- + _silenceModeExcluded.add(playerObjId);
- + }
- +
- private void storeRecipeShopList()
- {
- Connection con = null;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement