Browse Source

Fixing invalid DefaultPunish configuration options

Reported by: Einhasad
Zoey76 4 years ago
parent
commit
f9ec03dfc2

+ 1 - 1
src/main/java/com/l2jserver/gameserver/enums/IllegalActionPunishmentType.java

@@ -26,6 +26,6 @@ public enum IllegalActionPunishmentType {
 	NONE,
 	BROADCAST,
 	KICK,
-	KICKBAN,
+	KICK_BAN,
 	JAIL
 }

+ 2 - 2
src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java

@@ -54,7 +54,7 @@ public final class IllegalPlayerActionTask implements Runnable {
 				_actor.sendMessage("You will be kicked for illegal action, GM informed.");
 				break;
 			}
-			case KICKBAN: {
+			case KICK_BAN: {
 				if (!_actor.isGM()) {
 					_actor.setAccessLevel(-1);
 					_actor.setAccountAccesslevel(-1);
@@ -84,7 +84,7 @@ public final class IllegalPlayerActionTask implements Runnable {
 					_actor.logout(false);
 					break;
 				}
-				case KICKBAN: {
+				case KICK_BAN: {
 					PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + general().getDefaultPunishParam(), _message, getClass().getSimpleName()));
 					break;
 				}

+ 7 - 6
src/main/resources/config/general.properties

@@ -727,12 +727,13 @@ NumberOfNecessaryPartyMembers = 4
 # ---------------------------------------------------------------------------
 
 # Player punishment for illegal actions:
-# 1 - broadcast warning to gms only
-# 2 - kick player(default)
-# 3 - kick & ban player
-# 4 - jail player (define minutes of jail with param: 0 = infinite)
-# Default: 2
-DefaultPunish = 2
+# NONE      - do nothing
+# BROADCAST - broadcast warning to GMs only
+# KICK      - kick player(default)
+# KICK_BAN  - kick & ban player
+# JAIL      - jail player (define minutes of jail with param: 0 = infinite)
+# Default: KICK
+DefaultPunish = KICK
 
 # This setting typically specifies the duration of the above punishment.
 # Default: 0