PublicMirrors/EmuLinkerSF
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v90.1 update

Browse Source
This commit is contained in:
Jgunishka 2021-02-22 19:29:10 +02:00
parent 9c7105ae93
commit 630c087c18
5 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/emulinker/kaillera/controller/v086/action/ChatAction.java
View File

@ -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); 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); 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); 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().announce("<" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, user); user.getGame().announce("<" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, user);
} }*/
} }
catch (NoSuchElementException e) 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); 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); 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); 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().announce("<" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, user); user.getGame().announce("<" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, user);
} }*/
} }
catch(NoSuchElementException e1){ catch(NoSuchElementException e1){
try {clientHandler.send(new InformationMessage(clientHandler.getNextMessageNumber(), "server","Private Message Error: /msg <UserID> <message>")); } catch(Exception e2) {} try {clientHandler.send(new InformationMessage(clientHandler.getNextMessageNumber(), "server","Private Message Error: /msg <UserID> <message>")); } catch(Exception e2) {}

16
src/org/emulinker/kaillera/controller/v086/action/GameChatAction.java
View File

@ -243,13 +243,13 @@ public class GameChatAction implements V086Action, V086GameEventHandler
user1.setLastMsgID(user.getID()); user1.setLastMsgID(user.getID());
user.setLastMsgID(user1.getID()); user.setLastMsgID(user1.getID());
user1.getServer().announce("TO: <" + user.getName() + ">(" + user.getID() + ") <" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, false, user1); //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); //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); 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); user.getGame().announce("<" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, user);
} }
return; 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); //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); //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); 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); user.getGame().announce("<" + clientHandler.getUser().getName() + "> (" + clientHandler.getUser().getID() + "): " + m, user);
} }
return; return;

17
src/org/emulinker/kaillera/model/impl/KailleraGameImpl.java
View File

@ -310,23 +310,8 @@ public final class KailleraGameImpl implements KailleraGame
throw new GameChatException(EmuLang.getString("KailleraGameImpl.GameChatErrorNotInGame")); //$NON-NLS-1$ 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) 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()) if (server.getMaxGameChatLength() > 0 && message.length() > server.getMaxGameChatLength())
{ {
log.warn(user + " gamechat denied: 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)) //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("************************", user);
announce("Type /p2pon to ignore ALL server activity during gameplay.", 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); announce("This will reduce lag that you contribute due to a busy server.", user);

2
src/org/emulinker/kaillera/model/impl/KailleraServerImpl.java
View File

@ -608,7 +608,7 @@ public class KailleraServerImpl implements KailleraServer, Executable
userImpl.addEvent(new InfoMessageEvent(user, EmuLang.getString("KailleraServerImpl.AdminWelcomeMessage"))); userImpl.addEvent(new InfoMessageEvent(user, EmuLang.getString("KailleraServerImpl.AdminWelcomeMessage")));
try { Thread.sleep(20); } catch(Exception e) {} 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) {} try { Thread.sleep(20); } catch(Exception e) {}
addEvent(new UserJoinedEvent(this, user)); addEvent(new UserJoinedEvent(this, user));

6
src/org/emulinker/kaillera/release/KailleraServerReleaseInfo.java
View File

@ -13,11 +13,11 @@ public final class KailleraServerReleaseInfo implements ReleaseInfo
private final int majorVersion = 0; private final int majorVersion = 0;
private final int minorVersion = 90; 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 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() public KailleraServerReleaseInfo()
{ {