🆙 Cleanup 2
This commit is contained in:
parent
9060541fab
commit
c116cbae22
@ -39,7 +39,7 @@ public class BanCommand extends Command {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (params[1].toLowerCase().equals(gameClient.getHabbo().getHabboInfo().getUsername().toLowerCase())) {
|
if (params[1].equalsIgnoreCase(gameClient.getHabbo().getHabboInfo().getUsername())) {
|
||||||
gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_ban.ban_self"), RoomChatMessageBubbles.ALERT);
|
gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_ban.ban_self"), RoomChatMessageBubbles.ALERT);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -39,7 +39,7 @@ public class CommandHandler {
|
|||||||
public CommandHandler() {
|
public CommandHandler() {
|
||||||
long millis = System.currentTimeMillis();
|
long millis = System.currentTimeMillis();
|
||||||
this.reloadCommands();
|
this.reloadCommands();
|
||||||
LOGGER.info("Command Handler -> Loaded! (" + (System.currentTimeMillis() - millis) + " MS)");
|
LOGGER.info("Command Handler -> Loaded! ({} MS)", System.currentTimeMillis() - millis);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void addCommand(Command command) {
|
public static void addCommand(Command command) {
|
||||||
@ -71,7 +71,7 @@ public class CommandHandler {
|
|||||||
if (parts.length >= 1) {
|
if (parts.length >= 1) {
|
||||||
for (Command command : commands.values()) {
|
for (Command command : commands.values()) {
|
||||||
for (String s : command.keys) {
|
for (String s : command.keys) {
|
||||||
if (s.toLowerCase().equals(parts[0].toLowerCase())) {
|
if (s.equalsIgnoreCase(parts[0])) {
|
||||||
boolean succes = false;
|
boolean succes = false;
|
||||||
if (command.permission == null || gameClient.getHabbo().hasPermission(command.permission, gameClient.getHabbo().getHabboInfo().getCurrentRoom() != null && (gameClient.getHabbo().getHabboInfo().getCurrentRoom().hasRights(gameClient.getHabbo())) || gameClient.getHabbo().hasPermission(Permission.ACC_PLACEFURNI) || (gameClient.getHabbo().getHabboInfo().getCurrentRoom() != null && gameClient.getHabbo().getHabboInfo().getCurrentRoom().getGuildId() > 0 && gameClient.getHabbo().getHabboInfo().getCurrentRoom().getGuildRightLevel(gameClient.getHabbo()).isEqualOrGreaterThan(RoomRightLevels.GUILD_RIGHTS)))) {
|
if (command.permission == null || gameClient.getHabbo().hasPermission(command.permission, gameClient.getHabbo().getHabboInfo().getCurrentRoom() != null && (gameClient.getHabbo().getHabboInfo().getCurrentRoom().hasRights(gameClient.getHabbo())) || gameClient.getHabbo().hasPermission(Permission.ACC_PLACEFURNI) || (gameClient.getHabbo().getHabboInfo().getCurrentRoom() != null && gameClient.getHabbo().getHabboInfo().getCurrentRoom().getGuildId() > 0 && gameClient.getHabbo().getHabboInfo().getCurrentRoom().getGuildRightLevel(gameClient.getHabbo()).isEqualOrGreaterThan(RoomRightLevels.GUILD_RIGHTS)))) {
|
||||||
try {
|
try {
|
||||||
|
@ -30,7 +30,7 @@ public class CoordsCommand extends Command {
|
|||||||
"Tile stack height: " + gameClient.getHabbo().getHabboInfo().getCurrentRoom().getLayout().getTile(gameClient.getHabbo().getRoomUnit().getX(), gameClient.getHabbo().getRoomUnit().getY()).getStackHeight());
|
"Tile stack height: " + gameClient.getHabbo().getHabboInfo().getCurrentRoom().getLayout().getTile(gameClient.getHabbo().getRoomUnit().getX(), gameClient.getHabbo().getRoomUnit().getY()).getStackHeight());
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
RoomTile tile = gameClient.getHabbo().getHabboInfo().getCurrentRoom().getLayout().getTile(Short.valueOf(params[1]), Short.valueOf(params[2]));
|
RoomTile tile = gameClient.getHabbo().getHabboInfo().getCurrentRoom().getLayout().getTile(Short.parseShort(params[1]), Short.parseShort(params[2]));
|
||||||
|
|
||||||
if (tile != null) {
|
if (tile != null) {
|
||||||
gameClient.getHabbo().alert(Emulator.getTexts().getValue("commands.generic.cmd_coords.title") + "\r\n" +
|
gameClient.getHabbo().alert(Emulator.getTexts().getValue("commands.generic.cmd_coords.title") + "\r\n" +
|
||||||
|
@ -17,7 +17,7 @@ public class DisconnectCommand extends Command {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (params[1].toLowerCase().equals(gameClient.getHabbo().getHabboInfo().getUsername().toLowerCase())) {
|
if (params[1].equalsIgnoreCase(gameClient.getHabbo().getHabboInfo().getUsername())) {
|
||||||
gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_disconnect.disconnect_self"), RoomChatMessageBubbles.ALERT);
|
gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_disconnect.disconnect_self"), RoomChatMessageBubbles.ALERT);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -770,7 +770,7 @@ public class ItemManager {
|
|||||||
for (int i = this.items.size(); i-- > 0; ) {
|
for (int i = this.items.size(); i-- > 0; ) {
|
||||||
try {
|
try {
|
||||||
item.advance();
|
item.advance();
|
||||||
if (item.value().getName().toLowerCase().equals(itemName.toLowerCase())) {
|
if (item.value().getName().equalsIgnoreCase(itemName)) {
|
||||||
return item.value();
|
return item.value();
|
||||||
}
|
}
|
||||||
} catch (NoSuchElementException e) {
|
} catch (NoSuchElementException e) {
|
||||||
@ -781,6 +781,7 @@ public class ItemManager {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public YoutubeManager getYoutubeManager() {
|
public YoutubeManager getYoutubeManager() {
|
||||||
return this.youtubeManager;
|
return this.youtubeManager;
|
||||||
}
|
}
|
||||||
|
@ -1126,7 +1126,7 @@ public class RoomManager {
|
|||||||
|
|
||||||
for (Room room : this.activeRooms.values()) {
|
for (Room room : this.activeRooms.values()) {
|
||||||
for (String s : room.getTags().split(";")) {
|
for (String s : room.getTags().split(";")) {
|
||||||
if (s.toLowerCase().equals(tag.toLowerCase())) {
|
if (s.equalsIgnoreCase(tag)) {
|
||||||
rooms.add(room);
|
rooms.add(room);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -1138,6 +1138,7 @@ public class RoomManager {
|
|||||||
return rooms;
|
return rooms;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public ArrayList<Room> getGroupRoomsWithName(String name) {
|
public ArrayList<Room> getGroupRoomsWithName(String name) {
|
||||||
ArrayList<Room> rooms = new ArrayList<>();
|
ArrayList<Room> rooms = new ArrayList<>();
|
||||||
|
|
||||||
|
@ -107,7 +107,7 @@ public abstract class HabboItem implements Runnable, IEventTriggers {
|
|||||||
serverMessage.appendInt(this.getRotation());
|
serverMessage.appendInt(this.getRotation());
|
||||||
serverMessage.appendString(Double.toString(this.z));
|
serverMessage.appendString(Double.toString(this.z));
|
||||||
|
|
||||||
serverMessage.appendString((this.getBaseItem().getInteractionType().getType() == InteractionTrophy.class || this.getBaseItem().getInteractionType().getType() == InteractionCrackable.class || this.getBaseItem().getName().toLowerCase().equals("gnome_box")) ? "1.0" : ((this.getBaseItem().allowWalk() || this.getBaseItem().allowSit() && this.roomId != 0) ? Item.getCurrentHeight(this) + "" : ""));
|
serverMessage.appendString((this.getBaseItem().getInteractionType().getType() == InteractionTrophy.class || this.getBaseItem().getInteractionType().getType() == InteractionCrackable.class || this.getBaseItem().getName().equalsIgnoreCase("gnome_box")) ? "1.0" : ((this.getBaseItem().allowWalk() || this.getBaseItem().allowSit() && this.roomId != 0) ? Item.getCurrentHeight(this) + "" : ""));
|
||||||
//serverMessage.appendString( ? "1.0" : ((this.getBaseItem().allowWalk() || this.getBaseItem().allowSit() && this.roomId != 0) ? Item.getCurrentHeight(this) : ""));
|
//serverMessage.appendString( ? "1.0" : ((this.getBaseItem().allowWalk() || this.getBaseItem().allowSit() && this.roomId != 0) ? Item.getCurrentHeight(this) : ""));
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
@ -42,7 +42,7 @@ public class GuildChangeBadgeEvent extends MessageHandler {
|
|||||||
base += 3;
|
base += 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (guild.getBadge().toLowerCase().equals(badge.toLowerCase()))
|
if (guild.getBadge().equalsIgnoreCase(badge))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
GuildChangedBadgeEvent badgeEvent = new GuildChangedBadgeEvent(guild, badge);
|
GuildChangedBadgeEvent badgeEvent = new GuildChangedBadgeEvent(guild, badge);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user