diff --git a/src/org/emulinker/kaillera/controller/v086/action/ChatAction.java b/src/org/emulinker/kaillera/controller/v086/action/ChatAction.java index 83ad4ad..b85f99f 100644 --- a/src/org/emulinker/kaillera/controller/v086/action/ChatAction.java +++ b/src/org/emulinker/kaillera/controller/v086/action/ChatAction.java @@ -233,13 +233,13 @@ public class ChatAction implements V086Action, V086ServerEventHandler user1.getServer().announce("TO: <" + user.getName() + ">(" + user.getID() + ") <" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, false, user1); user.getServer().announce("<" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, false, user); - if(user1.getGame() != null){ + /*if(user1.getGame() != null){ user1.getGame().announce("TO: <" + user.getName() + ">(" + user.getID() + ") <" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, user1); } if(user.getGame() != null){ user.getGame().announce("<" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, user); - } + }*/ } catch (NoSuchElementException e) { @@ -299,13 +299,13 @@ public class ChatAction implements V086Action, V086ServerEventHandler user1.getServer().announce("TO: <" + user.getName() + ">(" + user.getID() + ") <" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, false, user1); user.getServer().announce("<" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, false, user); - if(user1.getGame() != null){ + /*if(user1.getGame() != null){ user1.getGame().announce("TO: <" + user.getName() + ">(" + user.getID() + ") <" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, user1); } if(user.getGame() != null){ user.getGame().announce("<" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, user); - } + }*/ } catch(NoSuchElementException e1){ try {clientHandler.send(new InformationMessage(clientHandler.getNextMessageNumber(), "server","Private Message Error: /msg ")); } catch(Exception e2) {} diff --git a/src/org/emulinker/kaillera/controller/v086/action/GameChatAction.java b/src/org/emulinker/kaillera/controller/v086/action/GameChatAction.java index deb2fb8..a055299 100644 --- a/src/org/emulinker/kaillera/controller/v086/action/GameChatAction.java +++ b/src/org/emulinker/kaillera/controller/v086/action/GameChatAction.java @@ -243,13 +243,13 @@ public class GameChatAction implements V086Action, V086GameEventHandler user1.setLastMsgID(user.getID()); user.setLastMsgID(user1.getID()); - user1.getServer().announce("TO: <" + user.getName() + ">(" + user.getID() + ") <" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, false, user1); - user.getServer().announce("<" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, false, user); - if(user1.getGame() != null){ + //user1.getServer().announce("TO: <" + user.getName() + ">(" + user.getID() + ") <" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, false, user1); + //user.getServer().announce("<" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, false, user); + if(user1.getGame() != null && user1.getGame() == user.getGame()){ user1.getGame().announce("TO: <" + user.getName() + ">(" + user.getID() + ") <" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, user1); } - if(user.getGame() != null){ + if(user.getGame() != null && user.getGame() == user1.getGame()){ user.getGame().announce("<" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, user); } return; @@ -310,14 +310,14 @@ public class GameChatAction implements V086Action, V086GameEventHandler } } - user1.getServer().announce("TO: <" + user.getName() + ">(" + user.getID() + ") <" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, false, user1); - user.getServer().announce("<" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, false, user); + //user1.getServer().announce("TO: <" + user.getName() + ">(" + user.getID() + ") <" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, false, user1); + //user.getServer().announce("<" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, false, user); - if(user1.getGame() != null){ + if(user1.getGame() != null && user1.getGame() == user.getGame()){ user1.getGame().announce("TO: <" + user.getName() + ">(" + user.getID() + ") <" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, user1); } - if(user.getGame() != null){ + if(user.getGame() != null && user.getGame() == user1.getGame()){ user.getGame().announce("<" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, user); } return; diff --git a/src/org/emulinker/kaillera/model/impl/KailleraGameImpl.java b/src/org/emulinker/kaillera/model/impl/KailleraGameImpl.java index cd7b0b5..9f8536f 100644 --- a/src/org/emulinker/kaillera/model/impl/KailleraGameImpl.java +++ b/src/org/emulinker/kaillera/model/impl/KailleraGameImpl.java @@ -310,23 +310,8 @@ public final class KailleraGameImpl implements KailleraGame throw new GameChatException(EmuLang.getString("KailleraGameImpl.GameChatErrorNotInGame")); //$NON-NLS-1$ } - message = message.trim(); - if (message.length() == 0 || message.startsWith(" ") || message.startsWith("­")) - return; - if (user.getAccess() == AccessManager.ACCESS_NORMAL) { - char[] chars = message.toCharArray(); - for (int i = 0; i < chars.length; i++) - { - if (chars[i] < 32) - { - log.warn(user + " gamechat denied: Illegal characters in message"); - addEvent(new GameInfoEvent(this, EmuLang.getString("KailleraGameImpl.GameChatDeniedIllegalCharacters"), user)); - throw new GameChatException(EmuLang.getString("KailleraGameImpl.GameChatDeniedIllegalCharacters")); - } - } - if (server.getMaxGameChatLength() > 0 && message.length() > server.getMaxGameChatLength()) { log.warn(user + " gamechat denied: Message Length > " + server.getMaxGameChatLength()); @@ -485,7 +470,7 @@ public final class KailleraGameImpl implements KailleraGame //if(user.equals(owner)) //{ - announce("Help: " + getServer().getReleaseInfo().getProductName() + " v" + getServer().getReleaseInfo().getVersionString() + ": " + getServer().getReleaseInfo().getReleaseDate() + " - Visit: https://github.com/God-Weapon", user); + announce("Help: " + getServer().getReleaseInfo().getProductName() + " v" + getServer().getReleaseInfo().getVersionString() + ": " + getServer().getReleaseInfo().getReleaseDate() + " - Visit: https://god-weapon.github.io", user); announce("************************", user); announce("Type /p2pon to ignore ALL server activity during gameplay.", user); announce("This will reduce lag that you contribute due to a busy server.", user); diff --git a/src/org/emulinker/kaillera/model/impl/KailleraServerImpl.java b/src/org/emulinker/kaillera/model/impl/KailleraServerImpl.java index ea28aca..c7a7ed8 100644 --- a/src/org/emulinker/kaillera/model/impl/KailleraServerImpl.java +++ b/src/org/emulinker/kaillera/model/impl/KailleraServerImpl.java @@ -608,7 +608,7 @@ public class KailleraServerImpl implements KailleraServer, Executable userImpl.addEvent(new InfoMessageEvent(user, EmuLang.getString("KailleraServerImpl.AdminWelcomeMessage"))); try { Thread.sleep(20); } catch(Exception e) {} - userImpl.addEvent(new InfoMessageEvent(user, getReleaseInfo().getProductName() + " v" + getReleaseInfo().getVersionString() + ": " + getReleaseInfo().getReleaseDate() + " - Visit: https://github.com/God-Weapon")); + userImpl.addEvent(new InfoMessageEvent(user, getReleaseInfo().getProductName() + " v" + getReleaseInfo().getVersionString() + ": " + getReleaseInfo().getReleaseDate() + " - Visit: https://god-weapon.github.io")); try { Thread.sleep(20); } catch(Exception e) {} addEvent(new UserJoinedEvent(this, user)); diff --git a/src/org/emulinker/kaillera/release/KailleraServerReleaseInfo.java b/src/org/emulinker/kaillera/release/KailleraServerReleaseInfo.java index e1ae7bf..69bc4a6 100644 --- a/src/org/emulinker/kaillera/release/KailleraServerReleaseInfo.java +++ b/src/org/emulinker/kaillera/release/KailleraServerReleaseInfo.java @@ -13,11 +13,11 @@ public final class KailleraServerReleaseInfo implements ReleaseInfo private final int majorVersion = 0; private final int minorVersion = 90; - private final int buildNumber = 0; + private final int buildNumber = 1; - private final String releaseDate = "08-20-2019"; + private final String releaseDate = "02-22-2021"; private final String licenseInfo = "Usage of this sofware is subject to the terms found in the included license"; - private final String website = "https://github.com/God-Weapon"; + private final String website = "https://god-weapon.github.io"; public KailleraServerReleaseInfo() {