More config changes to match newer branches.
This commit is contained in:
		| @@ -1,23 +0,0 @@ | ||||
| # --------------------------------------------------------------------------- | ||||
| # AntiFeed | ||||
| # --------------------------------------------------------------------------- | ||||
|  | ||||
| # This option will enable antifeed for pvp/pk/clanrep points. | ||||
| # Default: False | ||||
| AntiFeedEnable = False | ||||
|  | ||||
| # If set to True, kills from dualbox will not increase pvp/pk points | ||||
| # and clan reputation will not be transferred. | ||||
| # Default: True | ||||
| AntiFeedDualbox = True | ||||
|  | ||||
| # If set to True, server will count disconnected (unable to determine ip address) | ||||
| # as dualbox. | ||||
| # Default: True | ||||
| AntiFeedDisconnectedAsDualbox = True | ||||
|  | ||||
| # If character died faster than timeout - pvp/pk points for killer will not increase | ||||
| # and clan reputation will not be transferred. | ||||
| # Setting to 0 will disable this feature. | ||||
| # Default: 120 seconds. | ||||
| AntiFeedInterval = 120 | ||||
| @@ -13,23 +13,6 @@ | ||||
| # Default: False | ||||
| EverybodyHasAdminRights = False | ||||
|  | ||||
| # Setting for serverList | ||||
| # Displays [] in front of server name on character selection | ||||
| # Default: False | ||||
| ServerListBrackets = False | ||||
|  | ||||
| # Displays server type next to the server name on character selection. | ||||
| # Notes: | ||||
| #	Accepted Values: Normal, Relax, Test, NoLabel, Restricted, Event, Free | ||||
| # Default: Normal | ||||
| ServerListType = Free | ||||
|   | ||||
| # Displays server minimum age to the server name on character selection. | ||||
| # Notes: | ||||
| #	Accepted values: 0, 15, 18 | ||||
| # Default: 0 | ||||
| ServerListAge = 0 | ||||
|  | ||||
|  | ||||
| # If True, only accounts with GM access can enter the server. | ||||
| # Default: False | ||||
| @@ -72,7 +55,7 @@ GMSkillRestriction = True | ||||
|  | ||||
| # Allow GMs to drop/trade non-tradable and quest(drop only) items | ||||
| # Default: False | ||||
| GMTradeRestrictedItems = True | ||||
| GMTradeRestrictedItems = False | ||||
|  | ||||
| # Allow GMs to restart/exit while is fighting stance | ||||
| # Default: True | ||||
| @@ -145,76 +128,6 @@ SkillCheckRemove = True | ||||
| SkillCheckGM = False | ||||
|  | ||||
|  | ||||
| # --------------------------------------------------------------------------- | ||||
| # Dead Lock Detector (separate thread for detecting deadlocks) | ||||
| # --------------------------------------------------------------------------- | ||||
| # For improved crash logs and automatic restart in deadlock case if enabled. | ||||
| # Check interval is in seconds. | ||||
| # Default: True | ||||
| DeadLockDetector = True | ||||
|  | ||||
| # Default: 20 | ||||
| DeadLockCheckInterval = 20 | ||||
|  | ||||
| # Default: False | ||||
| RestartOnDeadlock = False | ||||
|  | ||||
|  | ||||
| # --------------------------------------------------------------------------- | ||||
| # Client packet queue tuning | ||||
| # --------------------------------------------------------------------------- | ||||
|  | ||||
| # Queue size, do not set it too low ! | ||||
| # 0 - use value MaxReadPerPass + 2 (from mmo.properties) | ||||
| # Default: 0 | ||||
| ClientPacketQueueSize = 80 | ||||
|  | ||||
| # Maximum number of packets in burst. | ||||
| # Execution will be aborted and thread released if more packets executed in raw. | ||||
| # 0 - use value MaxReadPerPass + 1 (from mmo.properties) | ||||
| # Default: 0 | ||||
| ClientPacketQueueMaxBurstSize = 70 | ||||
|  | ||||
| # Maximum number of packets per second. | ||||
| # Flood detector will be triggered if more packets received. | ||||
| # After triggering all incoming packets will be dropped until flooding stopped. | ||||
| # Default: 80 | ||||
| ClientPacketQueueMaxPacketsPerSecond = 160 | ||||
|  | ||||
| # Average number of packets per second calculated during this interval. | ||||
| # Using larger value decrease number of false kicks, but slower reaction to flood. | ||||
| # Avoid using too low or too high values, recommended between 3 and 10. | ||||
| # Default: 5 | ||||
| ClientPacketQueueMeasureInterval = 15 | ||||
|  | ||||
| # Maximum average number of packets per second during measure interval. | ||||
| # Flood detector will be triggered if more packets received. | ||||
| # After triggering all incoming packets will be dropped until flooding stopped. | ||||
| # Default: 40 | ||||
| ClientPacketQueueMaxAveragePacketsPerSecond = 120 | ||||
|  | ||||
| # Maximum number of flood triggers per minute. | ||||
| # Client will be kicked if more floods detected. | ||||
| # Default: 2 | ||||
| ClientPacketQueueMaxFloodsPerMin = 5 | ||||
|  | ||||
| # Maximum number of queue overflows per minute. | ||||
| # After overflow all incoming packets from client are dropped until queue is flushed. | ||||
| # Client will be kicked if more queue overflows detected. | ||||
| # Default: 1 | ||||
| ClientPacketQueueMaxOverflowsPerMin = 10 | ||||
|  | ||||
| # Maximum number of buffer underflows per minute. | ||||
| # Client will be kicked if more underflow exceptions detected. | ||||
| # Default: 1 | ||||
| ClientPacketQueueMaxUnderflowsPerMin = 10 | ||||
|  | ||||
| # Maximum number of unknown packets per minute. | ||||
| # Client will be kicked if more unknown packets received. | ||||
| # Default: 5 | ||||
| ClientPacketQueueMaxUnknownPerMin = 5 | ||||
|  | ||||
|  | ||||
| # --------------------------------------------------------------------------- | ||||
| # Optimization | ||||
| # --------------------------------------------------------------------------- | ||||
| @@ -246,14 +159,8 @@ ListOfProtectedItems = 0 | ||||
| # Default: True | ||||
| DatabaseCleanUp = True | ||||
|  | ||||
| # The time before a database connection closes (in milliseconds) | ||||
| # If a query takes longer to execute than the time defined here, the server will throw "Unclosed Connection!" error. | ||||
| # If you get often this error message, try increasing this. | ||||
| # Default: 60000ms | ||||
| ConnectionCloseTime = 60000 | ||||
|  | ||||
| # This is the interval (in minutes), that the gameserver will update a players information such as location. | ||||
| # The higher you set this number, there will be less character information saving so you will have less accessessing of the database and your hard drive(s). | ||||
| # The higher you set this number, there will be less character information saving so you will have less accessing of the database and your hard drive(s). | ||||
| # The lower you set this number, there will be more frequent character information saving so you will have more access to the database and your hard drive(s). | ||||
| # A value of 0 disables periodic saving. | ||||
| # Independent of this setting the character is always saved after leaving the world. | ||||
|   | ||||
| @@ -26,6 +26,30 @@ ListOfNonDroppableItems = 57,1147,425,1146,461,10,2368,7,6,2370,2369,6842,6611,6 | ||||
| MinimumPKRequiredToDrop = 6 | ||||
|  | ||||
|  | ||||
| # --------------------------------------------------------------------------- | ||||
| # AntiFeed | ||||
| # --------------------------------------------------------------------------- | ||||
|  | ||||
| # This option will enable antifeed for pvp/pk/clanrep points. | ||||
| # Default: False | ||||
| AntiFeedEnable = False | ||||
|  | ||||
| # If set to True, kills from dualbox will not increase pvp/pk points | ||||
| # and clan reputation will not be transferred. | ||||
| # Default: True | ||||
| AntiFeedDualbox = True | ||||
|  | ||||
| # If set to True, server will count disconnected (unable to determine ip address) as dualbox. | ||||
| # Default: True | ||||
| AntiFeedDisconnectedAsDualbox = True | ||||
|  | ||||
| # If character died faster than timeout - pvp/pk points for killer will not increase | ||||
| # and clan reputation will not be transferred. | ||||
| # Setting to 0 will disable this feature. | ||||
| # Default: 120 seconds. | ||||
| AntiFeedInterval = 120 | ||||
|  | ||||
|  | ||||
| # --------------------------------------------------------------------------- | ||||
| # Misc. | ||||
| # --------------------------------------------------------------------------- | ||||
|   | ||||
| @@ -76,8 +76,9 @@ RequestServerID = 1 | ||||
| AcceptAlternateID = True | ||||
|  | ||||
| # Datapack root directory. | ||||
| # Defaults to current directory from which the server is started unless the below line is uncommented. | ||||
| # WARNING: <u><b><font color="red">If the specified path is invalid, it will lead to multiple errors!</font></b></u> | ||||
| #Default: . | ||||
| # Default: . | ||||
| DatapackRoot = . | ||||
|  | ||||
| # Define how many players are allowed to play simultaneously on your server. | ||||
| @@ -90,6 +91,23 @@ MaximumOnlineUsers = 2000 | ||||
| # Default: 267;268;271;273 | ||||
| AllowedProtocolRevisions = 267;268;271;273 | ||||
|  | ||||
| # Displays server type next to the server name on character selection. | ||||
| # Notes: | ||||
| #	Accepted Values: Normal, Relax, Test, Broad, Restricted, Event, Free, World, New, Classic | ||||
| # Default: Free | ||||
| ServerListType = Free | ||||
|  | ||||
| # Displays server minimum age to the server name on character selection. | ||||
| # Notes: | ||||
| #	Accepted values: 0, 15, 18 | ||||
| # Default: 0 | ||||
| ServerListAge = 0 | ||||
|  | ||||
| # Setting for serverList | ||||
| # Displays [] in front of server name on character selection | ||||
| # Default: False | ||||
| ServerListBrackets = False | ||||
|  | ||||
|  | ||||
| # --------------------------------------------------------------------------- | ||||
| # Thread Configuration | ||||
| @@ -115,6 +133,21 @@ ThreadsPerInstantThreadPool = 20 | ||||
| UrgentPacketThreadCoreSize = 20 | ||||
|  | ||||
|  | ||||
| # --------------------------------------------------------------------------- | ||||
| # Dead Lock Detector (separate thread for detecting deadlocks) | ||||
| # --------------------------------------------------------------------------- | ||||
| # For improved crash logs and automatic restart in deadlock case if enabled. | ||||
| # Check interval is in seconds. | ||||
| # Default: True | ||||
| DeadLockDetector = True | ||||
|  | ||||
| # Default: 20 | ||||
| DeadLockCheckInterval = 20 | ||||
|  | ||||
| # Default: False | ||||
| RestartOnDeadlock = False | ||||
|  | ||||
|  | ||||
| # --------------------------------------------------------------------------- | ||||
| # Misc Player Settings | ||||
| # --------------------------------------------------------------------------- | ||||
|   | ||||
| @@ -78,7 +78,7 @@ public final class Fishing extends AbstractEffect | ||||
| 		 | ||||
| 		final L2PcInstance player = activeChar.getActingPlayer(); | ||||
| 		 | ||||
| 		if (!Config.ALLOWFISHING && !player.canOverrideCond(PcCondOverride.SKILL_CONDITIONS)) | ||||
| 		if (!Config.ALLOW_FISHING && !player.canOverrideCond(PcCondOverride.SKILL_CONDITIONS)) | ||||
| 		{ | ||||
| 			player.sendMessage("Fishing is disabled!"); | ||||
| 			return; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 MobiusDev
					MobiusDev