forked from 2009Scape/Server
Revert "Bunch of changes"
This commit is contained in:
parent
4c780b09ad
commit
bea505f34a
75 changed files with 746 additions and 2446 deletions
|
|
@ -49,11 +49,12 @@ public final class ServerConstants {
|
|||
* The administrators.
|
||||
*/
|
||||
public static final String[] ADMINISTRATORS = {
|
||||
"redsparr0w",
|
||||
"ethan",
|
||||
"austin",
|
||||
};
|
||||
|
||||
public static final String[] DATABASE_NAMES = {
|
||||
"server", "global"
|
||||
"keldagr1_server", "keldagr1_global"
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -305,8 +305,8 @@ public final class WorldPacketRepository {
|
|||
String macAddress = buffer.getString();
|
||||
String compName = buffer.getString();
|
||||
String serial = buffer.getString();
|
||||
int rights = buffer.getInt();
|
||||
int chatIcon = buffer.get();
|
||||
int rights = server.getInfo().getRevision() == 498 ? 0 : buffer.getInt();
|
||||
int chatIcon = server.getInfo().getRevision() == 498 ? 0 : buffer.get();
|
||||
UIDInfo uid = new UIDInfo(ipAddress, compName, macAddress, serial);
|
||||
PlayerSession player = new PlayerSession(username, password, new UIDInfo(ipAddress, compName, macAddress, serial));
|
||||
if (WorldDatabase.isActivePlayer(username)) {
|
||||
|
|
@ -430,7 +430,7 @@ public final class WorldPacketRepository {
|
|||
}
|
||||
ClanRepository clan = ClanRepository.get(server, clanName);
|
||||
if (clan == null) {
|
||||
sendPlayerMessage(player, "The channel you tried to join does not exist (" + clanName + ").<br/>Try joining the main clan named 'Sparr0w'.:clan:");
|
||||
sendPlayerMessage(player, "The channel you tried to join does not exist. Try joining the main clan named 'Keldagrim'.:clan:");
|
||||
return;
|
||||
}
|
||||
clan.enter(player);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue