diff options
178 files changed, 528 insertions, 690 deletions
diff --git a/.gitignore b/.gitignore index 5846e1e28..164936d32 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,5 @@ manifest.mf *.ipr *.iws .idea/ + +EssentialsRelease/
\ No newline at end of file diff --git a/Essentials/pom.xml b/Essentials/pom.xml index 76d9eeb04..281a1449a 100644 --- a/Essentials/pom.xml +++ b/Essentials/pom.xml @@ -17,11 +17,11 @@ <artifactId>BukkitPermissions</artifactId> <version>1.2</version> </dependency> - <dependency> + <!--<dependency> <groupId>org.bukkit</groupId> <artifactId>craftbukkit</artifactId> <version>${bukkit.version}</version> - </dependency> + </dependency>--> <dependency> <groupId>${project.groupId}</groupId> <artifactId>EssentialsGroupManager</artifactId> diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties index 33389e2a4..5b6c8d95d 100644 --- a/Essentials/src/messages_de.properties +++ b/Essentials/src/messages_de.properties @@ -1,7 +1,7 @@ -#version: ${build.number} +# version: 2.9.2 # Single quotes have to be doubled: '' # Translations start here -# by: +# by: xGhOsTkiLLeRx action=* {0} {1} addedToAccount=\u00a7a{0} wurden zu deiner Geldb\u00f6rse hinzugef\u00fcgt. addedToOthersAccount=\u00a7a{0} added to {1}\u00a7a account. New balance: {2} @@ -12,7 +12,7 @@ alertUsed=benutzt: autoAfkKickReason=Du wurdest gekickt, weil du f\u00fcr {0} Minuten inaktiv warst. backAfterDeath=\u00a77Benutze den Befehl /back um zu deinem Todespunkt zur\u00fcck zu kehren. backUsageMsg=\u00a77Kehre zur letzten Position zur\u00fcck. -backupDisabled=An external backup script has not been configured. +backupDisabled=Ein externes Backup-Skript wurde nicht konfiguriert. backupFinished=Backup beendet backupStarted=Backup gestartet balance=\u00a77Geldb\u00f6rse: {0} @@ -24,8 +24,8 @@ bannedIpsFileNotFound=banned-ips.txt nicht gefunden bannedPlayersFileError=Fehler beim Lesen von banned-players.txt bannedPlayersFileNotFound=banned-players.txt nicht gefunden bigTreeFailure=\u00a7cFehler beim Pflanzen eines grossen Baums. Versuch es auf Gras oder Dreck. -bigTreeSuccess= \u00a77Grosser Baum gepflanzt. -blockList=Essentials relayed the following commands to another plugin: +bigTreeSuccess= \u00a77Grossen Baum gepflanzt. +blockList=Essentials hat dieses Kommando an ein anderes Plugin weitergeleitet: broadcast=[\u00a7cRundruf\u00a7f]\u00a7a {0} buildAlert=\u00a7cDu hast keine Rechte zum Bauen. bukkitFormatChanged=Bukkit-Versionsformat hat sich ge\u00e4ndert. Version nicht kontrolliert. @@ -50,9 +50,9 @@ corruptNodeInConfig=\u00a74Hinweis: Deine Konfigurationsdatei hat einen ung\u00f couldNotFindTemplate=Vorlage {0} konnte nicht gefunden werden. creatingConfigFromTemplate=Erstelle Konfiguration aus Vorlage: {0} creatingEmptyConfig=Erstelle leere Konfiguration: {0} -creative=creative +creative=Creative currency={0}{1} -currentWorld=Current World: {0} +currentWorld=Aktuelle Welt: {0} day=Tag days=Tage defaultBanReason=Der Bann-Hammer hat gesprochen! @@ -67,42 +67,42 @@ dependancyNotFound=[Essentials] Eine erforderliche Abh\u00e4ngigkeit wurde nicht depth=\u00a77Du bist auf Meeresh\u00f6he. depthAboveSea=\u00a77Du bist {0} Bl\u00f6cke \u00fcber Meeresh\u00f6he. depthBelowSea=\u00a77Du bist {0} Bl\u00f6cke unter Meeresh\u00f6he. -destinationNotSet=Ziel nicht gesetzt +destinationNotSet=Ziel nicht gesetzt. disableUnlimited=\u00a77Deaktiviere unendliches Platzieren von {0} f\u00fcr {1}. disabled=deaktiviert -disabledToSpawnMob=Spawning this mob was disabled in the config file. +disabledToSpawnMob=Dieser Mob Typ wurde in der Konfiguration deaktiviert. dontMoveMessage=\u00a77Teleportvorgang startet in {0}. Beweg dich nicht. downloadingGeoIp=Lade GeoIP-Datenbank ... dies kann etwas dauern (country: 0.6 MB, city: 20MB) duplicatedUserdata=Doppelte Datei in userdata: {0} und {1} -durability=\u00a77This tool has \u00a7c{0}\u00a77 uses left +durability=\u00a77Dieses Werkzeug hat \u00a7c{0}\u00a77 Benutzungen \u00fcbrig. enableUnlimited=\u00a77Gebe {1} unendliche Mengen von {0}. enabled=aktiviert -enchantmentApplied = \u00a77The enchantment {0} has been applied to your item in hand. -enchantmentNotFound = \u00a7cEnchantment not found -enchantmentPerm = \u00a7cYou do not have the permission for {0} -enchantmentRemoved = \u00a77The enchantment {0} has been removed from your item in hand. -enchantments = \u00a77Enchantments: {0} +enchantmentApplied = \u00a77Die Verzauberung {0} wurde auf den Gegenstand in deiner Hand angewendet. +enchantmentNotFound = \u00a7cVerzauberung nicht gefunden. +enchantmentPerm = \u00a7cDu hast nicht die Berechtigung f\u00fcr die Verzauberung {0} +enchantmentRemoved = \u00a77Die Verzauberung {0} wurde von dem Gegenstand in deiner Hand entfernt. +enchantments = \u00a77Verzauberungen: {0} errorCallingCommand=Fehler beim Aufrufen des Befehls /{0} errorWithMessage=\u00a7cFehler: {0} -essentialsHelp1=The file is broken and Essentials can't open it. Essentials is now disabled. If you can't fix the file yourself, go to http://tiny.cc/EssentialsChat -essentialsHelp2=The file is broken and Essentials can't open it. Essentials is now disabled. If you can't fix the file yourself, either type /essentialshelp in game or go to http://tiny.cc/EssentialsChat +essentialsHelp1=Die Datei ist kaputt und Essentials kann sie nicht \u00f6ffnen. Essentials wird nun deaktiviert. Wenn du die Datei nicht selber reparieren kannst, gehe auf http://tiny.cc/EssentialsChat +essentialsHelp2=Die Datei ist kaputt und Essentials kann sie nicht \u00f6ffnen. Essentials wird nun deaktiviert. Wenn du die Datei nicht selber reparieren kannst, tippe entweder /essentialshelp oder gehe auf http://tiny.cc/EssentialsChat essentialsReload=\u00a77Essentials neu geladen {0} -exp=\u00a7c{0} \u00a77has\u00a7c {1} \u00a77exp (level\u00a7c {2}\u00a77) and needs\u00a7c {3} \u00a77more exp to level up. -expSet=\u00a7c{0} \u00a77now has\u00a7c {1} \u00a77exp. +exp=\u00a7c{0} \u00a77hat\u00a7c {1} \u00a77Erfahrungspunkte (Level\u00a7c {2}\u00a77) und braucht noch \u00a7c {3} \u00a77 Erfahrungspunkte zum Levelaufstieg. +expSet=\u00a7c{0} \u00a77hat nun\u00a7c {1} \u00a77Erfahrungspunkte. extinguish=\u00a77Du hast dich selbst gel\u00f6scht. extinguishOthers=\u00a77Du hast {0} gel\u00f6scht. failedToCloseConfig=Fehler beim Schliessen der Konfiguration {0} failedToCreateConfig=Fehler beim Erstellen der Konfiguration {0} failedToWriteConfig=Fehler beim Schreiben der Konfiguration {0} -false=\u00a74false\u00a7f -feed=\u00a77Your appetite was sated. -feedOther=\u00a77Satisfied {0}. +false=\u00a74nein\u00a7f +feed=\u00a77Dein Hunger wurde gestillt. +feedOther={0} \u00a77gef\u00fcttert. fileRenameError=Umbenennen von {0} gescheitert. -flyMode=\u00a77Set fly mode {0} for {1}. -flying=flying +flyMode=\u00a77Fliegen {0} f\u00fcr {1}. +flying=fliegt gerade foreverAlone=\u00a7cDu hast niemanden, dem du antworten kannst. freedMemory={0} MB frei gemacht. -gameMode=\u00a77Set game mode {0} for {1}. +gameMode=\u00a77Spielmodus von {1} \u00a77ge\u00e4ndert in {0}. gcchunks= Chunks, gcentities= Einheiten gcfree=Freier Speicher: {0} MB @@ -114,20 +114,20 @@ geoipJoinFormat=Spieler {0} kommt aus {1} godDisabledFor=deaktiviert f\u00fcr {0} godEnabledFor=aktiviert f\u00fcr {0} godMode=\u00a77Unsterblichkeit {0}. -hatArmor=\u00a7cError, you cannot use this item as a hat! -hatEmpty=\u00a7cSie tragen keinen Hut. -hatFail=\u00a7cYou must have something to wear in your hand. -hatPlaced=\u00a7eEnjoy your new hat! +hatArmor=\u00a7cFehler, du kannst dieses Item nicht als Hut tragen. +hatEmpty=\u00a7cDu tr\u00e4gst keinen Hut. +hatFail=\u00a7cDu musst etwas in der Hand halten! +hatPlaced=\u00a7eViel Spass mit deinem Hut. haveBeenReleased=\u00a77Du wurdest frei gelassen. heal=\u00a77Du wurdest geheilt. healOther=\u00a77{0} geheilt. helpConsole=Um die Hilfe der Konsole zu sehen, schreibe ?. -helpFrom=\u00a77Commands from {0}: +helpFrom=\u00a77Kommandos von {0}: helpLine=\u00a76/{0}\u00a7f: {1} -helpMatching=\u00a77Commands matching "{0}": +helpMatching=\u00a77Kommandos \u00fcbereinstimmend mit "{0}": helpOp=\u00a7c[Hilfe]\u00a7f \u00a77{0}:\u00a7f {1} helpPages=Seite \u00a7c{0}\u00a7f von \u00a7c{1}\u00a7f: -helpPlugin=\u00a74{0}\u00a7f: Plugin Help: /help {1} +helpPlugin=\u00a74{0}\u00a7f: Plugin Hilfe: /help {1} holeInFloor=Loch im Boden homeSet=\u00a77Zuhause gesetzt. homeSetToBed=\u00a77Dein Zuhause ist nun an diesem Bett. @@ -146,7 +146,7 @@ invRestored=Dein Inventar wurde wieder hergestellt. invSee=Du siehst das Inventar von {0}. invSeeHelp=Benutze /invsee um dein Inventar wiederherzustellen. invalidCharge=\u00a7cUng\u00fcltige Verf\u00fcgung. -invalidHome=Home {0} doesn't exist +invalidHome=Zuhause {0} existiert nicht. invalidMob=Ung\u00fcltiger Monstername. invalidServer=Ung\u00fcltiger Server! invalidSignLine=Die Zeile {0} auf dem Schild ist falsch. @@ -164,7 +164,7 @@ itemSold=\u00a77Verkauft f\u00fcr \u00a7c{0}\u00a77 ({1} {2} Einheiten je {3}) itemSoldConsole={0} verkauft {1} f\u00fcr \u00a77{2}\u00a77 ({3} Einheiten je {4}) itemSpawn=\u00a77Gebe {0}x {1} itemsCsvNotLoaded=Konnte items.csv nicht laden. -jailAlreadyIncarcerated=\u00a7cPerson is already in jail: {0} +jailAlreadyIncarcerated=\u00a7cDie Person ist schon im Gef\u00e4ngnis: {0} jailMessage=\u00a7cDu hast ein Verbrechen begangen, also hast du Zeit. jailNotExist=Dieses Gef\u00e4ngnis existiert nicht. jailReleased=\u00a77Spieler \u00a7e{0}\u00a77 wurde freigelassen. @@ -174,7 +174,7 @@ jailSet=\u00a77Gef\u00e4ngnis {0} wurde erstellt. jumpError=Das w\u00fcrde deinen Computer \u00fcberlasten. kickDefault=Vom Server geworfen kickExempt=\u00a7cDu kannst diesen Spieler nicht rauswerfen. -kickedAll=\u00a7cKicked all players from server +kickedAll=\u00a7cAlle Spieler vom Server geworfen. kill=\u00a77{0} get\u00f6tet. kitError2=\u00a7cDiese Ausr\u00fcstung existiert nicht oder ist ung\u00fcltig. kitError=\u00a7cEs gibt keine g\u00fcltigen Ausr\u00fcstungen. @@ -207,7 +207,7 @@ missingItems=Du ben\u00f6tigst {0}x {1}. missingPrefixSuffix=Prefix/Suffix fehlt f\u00fcr {0} mobSpawnError=Fehler beim \u00e4ndern des Monster-Spawner. mobSpawnLimit=Anzahl an Monster auf Serverlimit beschr\u00e4nkt -mobSpawnTarget=Zielblock, muss ein Monster-Spawner sein. +mobSpawnTarget=Zielblock muss ein Monster-Spawner sein. mobsAvailable=\u00a77Mobs: {0} moneyRecievedFrom=\u00a7a{1} hat dir {0} gegeben. moneySentTo=\u00a7aDu hast {1} {0} gegeben. @@ -217,10 +217,10 @@ months=Monate moreThanZero=Anzahl muss gr\u00f6sser als 0 sein. msgFormat=\u00a77[{0}\u00a77 -> {1}\u00a77] \u00a7f{2} muteExempt=\u00a7cDu darfst diesen Spieler nicht stumm machen. -mutedPlayer=Player {0} ist nun stumm. -mutedPlayerFor=Player {0} ist nun stumm f\u00fcr {1}. +mutedPlayer=Spieler {0} ist nun stumm. +mutedPlayerFor=Spieler {0} ist nun stumm f\u00fcr {1}. mutedUserSpeaks={0} versuchte zu sprechen, aber ist stumm geschaltet. -nearbyPlayers=Players nearby: {0} +nearbyPlayers=Spieler in der Umgebung: {0} negativeBalanceError=Spieler darf keine Schulden machen. nickChanged=Nickname ge\u00e4ndert. nickDisplayName=\u00a77Du musst \u00a7fchange-displayname\u00a7c in der Essentials-Config aktivieren. @@ -231,10 +231,10 @@ nickOthersPermission=\u00a7cDu hast keine Rechte um den Nicknamen von anderen zu nickSet=\u00a77Dein Nickname ist nun \u00a7c{0} noAccessCommand=\u00a7cDu hast keinen Zugriff auf diesen Befehl. noAccessPermission=\u00a7cDu hast keine Rechte, den Block {0} zu \u00f6ffnen. -noBreakBedrock=You are not allowed to destroy bedrock. +noBreakBedrock=Du darfst Bedrock nicht abbauen. noDestroyPermission=\u00a7cDu hast keine Rechte, den Block {0} zu zerst\u00f6ren. -noDurability=\u00a7cThis item does not have a durability. -noGodWorldWarning=\u00a7cWarning! God mode in this world disabled. +noDurability=\u00a7cDieser Gegenstand hat keine Haltbarkeit. +noGodWorldWarning=\u00a7cWarnung! Unsterblichkeit ist in dieser Welt deaktiviert. noHelpFound=\u00a7cKeine \u00fcbereinstimmenden Kommandos. noHomeSet=Du hast kein Zuhause gesetzt. noHomeSetPlayer=Spieler hat kein Zuhause gesetzt. @@ -245,7 +245,7 @@ noMotd=\u00a7cEs existiert keine Willkommensnachricht. noNewMail=\u00a77Du hast keine Nachrichten. noPendingRequest=Du hast keine Teleportierungsanfragen. noPerm=\u00a7cDu hast die Rechte \u00a7f{0}\u00a7c nicht. -noPermToSpawnMob=\u00a7cYou don''t have permission to spawn this mob. +noPermToSpawnMob=\u00a7cDu hast nicht die Rechte um diesen Mob zu erzeugen. noPlacePermission=\u00a7cDu hast keine Rechte, einen Block in der N\u00e4he des Schildes zu platzieren. noPowerTools=Du hast keine Powertools zugewiesen. noRules=\u00a7cEs wurden keine Regeln definiert. @@ -253,20 +253,20 @@ noWarpsDefined=Keine Warp-Punkte erstellt. none=keine notAllowedToQuestion=\u00a7cDu bist nicht berechtigt zu fragen. notAllowedToShout=\u00a7cDu bist nicht berechtigt zu schreien. -notEnoughExperience=You do not have enough experience. +notEnoughExperience=Du hast nicht genug Erfahrungspunkte. notEnoughMoney=Du hast nicht genug Geld. -notFlying=not flying +notFlying=fliegt nicht notRecommendedBukkit=* ! * Die verwendete Bukkit-Version ist nicht f\u00fcr Essentials empfohlen. notSupportedYet=Noch nicht verf\u00fcgbar. -nothingInHand = \u00a7cYou have nothing in your hand. +nothingInHand = \u00a7cDu hast nichts in deiner Hand. now=jetzt -nuke=May death rain upon them +nuke=M\u00f6ge Tod auf sie regnen. numberRequired=Ein Zahl wird ben\u00f6tigt. onlyDayNight=/time unterst\u00fctzt nur day und night. onlyPlayers=Nur Spieler k\u00f6nnen {0} benutzen. onlySunStorm=/weather unterst\u00fctzt nur sun und storm. -orderBalances=Ordering balances of {0} users, please wait ... -pTimeCurrent=\u00a7e{0}''s\u00a7f time is {1}. +orderBalances=Lade die Geldb\u00f6rsen von {0} Spielern, bitte warten... +pTimeCurrent=\u00a7e{0}'\u00a7f Zeit ist {1}. pTimeCurrentFixed=\u00a7e{0}''s\u00a7f Zeit wurde zu {1} gesetzt. pTimeNormal=\u00a7e{0}''s\u00a7f Zeit ist normal und entspricht der Serverzeit. pTimeOthersPermission=\u00a7cDu hast keine Berechtigung die Zeit von anderen Spielern zu \u00e4ndern. @@ -277,7 +277,7 @@ pTimeSetFixed=Spielerzeit ist festgesetzt zu \u00a73{0}\u00a7f f\u00fcr: \u00a7e parseError=Fehler beim Parsen von {0} in Zeile {1} pendingTeleportCancelled=\u00a7cLaufende Teleportierung abgebrochen. permissionsError=Permissions/GroupManager fehlt; Chat-Prefixe/-Suffixe sind ausgeschaltet. -playerBanned=\u00a7cSpieler {0} gesperrt: {1} +playerBanned=\u00a7cSpieler {0} hat {1} gesperrt. Grund: {2} playerInJail=\u00a7cSpieler ist bereits in Gef\u00e4ngnis {0}. playerJailed=\u00a77Spieler {0} eingesperrt. playerJailedFor= \u00a77Spieler {0} eingesperrt f\u00fcr {1}. @@ -302,12 +302,12 @@ powerToolsDisabled=Alle deine Powertools wurden deaktiviert. powerToolsEnabled=Alle deine Powertools wurden aktiviert. protectionOwner=\u00a76[EssentialsProtect] Besitzer dieses Blocks: {0} questionFormat=\u00a77[Frage]\u00a7f {0} -readNextPage=Type /{0} {1} to read the next page -reloadAllPlugins=\u00a77Alle plugins neu geladen. -removed=\u00a77Removed {0} entities. +readNextPage=Tippe /{0} {1} um die n\u00e4chste Seite zu lesen +reloadAllPlugins=\u00a77Alle Plugins neu geladen. +removed=\u00a77{0} Wesen entfernt. repair=Du hast erfolgreich deine {0} repariert. repairAlreadyFixed=\u00a77Dieser Gegenstand ben\u00f6tigt keine Reparatur. -repairEnchanted=\u00a77You are not allowed to repair enchanted items. +repairEnchanted=\u00a77Du darfst keine verzauberten Gegenst\u00e4nde reparieren. repairInvalidType=\u00a7cDieser Gegenstand kann nicht repariert werden. repairNone=Es sind keine Gegenst\u00e4nde vorhanden, die repariert werden k\u00f6nnen. requestAccepted=\u00a77Teleportierungsanfrage akzeptiert. @@ -315,9 +315,9 @@ requestAcceptedFrom=\u00a77{0} hat deine Teleportierungsanfrage angenommen. requestDenied=\u00a77Teleportierungsanfrage verweigert. requestDeniedFrom=\u00a77{0} hat deine Teleportierungsanfrage abgelehnt. requestSent=\u00a77Anfrage gesendet an {0}\u00a77. -requestTimedOut=\u00a7cTeleport request has timed out -requiredBukkit= * ! * You need atleast build {0} of CraftBukkit, download it from http://dl.bukkit.org/downloads/craftbukkit/ -returnPlayerToJailError=Error occurred when trying to return player {0} to jail: {1} +requestTimedOut=\u00a7cTeleportierungsanfrage abgebrochen wegen Zeit\u00fcberschreitung +requiredBukkit= * ! * Du ben\u00f6tigst mind. Version {0} von CraftBukkit, downloade CraftBukkit von http://dl.bukkit.org/downloads/craftbukkit/ +returnPlayerToJailError=Fehler aufgetreten als Spieler {0} zum Gef\u00e4ngnis {1} zur\u00fcckkehrte. second=Sekunde seconds=Sekunden seenOffline=Spieler {0} ist offline seit {1} @@ -336,13 +336,13 @@ slimeMalformedSize=Ung\u00fcltige Gr\u00f6sse. soloMob=Das Monster m\u00f6chte allein sein. spawnSet=\u00a77Spawn-Punkt gesetzt f\u00fcr Gruppe {0}. spawned=erzeugt -sudoExempt=You cannot sudo this user -sudoRun=Forcing {0} to run: /{1} {2} +sudoExempt=Du kannst diesen Spieler nicht sudo machen +sudoRun=Zwinge {0} den Befehl auszuf\u00fchren: /{1} {2} suicideMessage=\u00a77Lebewohl grausame Welt... suicideSuccess= \u00a77{0} hat sich das Leben genommen. -survival=survival +survival=Survival takenFromAccount=\u00a7c{0} wurden aus deiner Geldb\u00f6rse genommen. -takenFromOthersAccount=\u00a7c{0} taken from {1}\u00a7c account. New balance: {2} +takenFromOthersAccount=\u00a7c{0} aus der Geldb\u00f6rse von {1}\u00a7c genommen. Neues Guthaben: {2} teleportAAll=\u00a77Teleportierungsanfrage zu allen Spielern gesendet... teleportAll=\u00a77Teleportiere alle Spieler... teleportAtoB=\u00a77{0}\u00a77 teleportiert dich zu {1}\u00a77. @@ -350,7 +350,7 @@ teleportDisabled={0} verweigert die Teleportierung. teleportHereRequest=\u00a7c{0}\u00a7c fragt, ob du dich zu ihm teleportierst. teleportNewPlayerError=Fehler beim Teleportieren eines neuen Spielers teleportRequest=\u00a7c{0}\u00a7c fragt, ob er sich zu dir teleportieren darf. -teleportRequestTimeoutInfo=\u00a77This request will timeout after {0} seconds. +teleportRequestTimeoutInfo=\u00a77Diese Anfrage wird nach {0} Sekunden auslaufen. teleportTop=\u00a77Teleportiere nach oben. teleportationCommencing=\u00a77Teleportierung gestartet... teleportationDisabled=\u00a77Teleportierung deaktiviert. @@ -359,7 +359,7 @@ teleporting=\u00a77Teleportiere... teleportingPortal=\u00a77Teleportiere durch Portal. tempBanned=Zeitlich gesperrt vom Server f\u00fcr {0} tempbanExempt=\u00a77Du kannst diesen Spieler nicht zeitlich sperren. -thunder= Es donnert nun in deiner Welt {0}. +thunder=Es donnert nun in deiner Welt {0}. thunderDuration=Es donnert nun f\u00fcr {1} Sekunden in deiner Welt {0}. timeBeforeHeal=Zeit bis zur n\u00e4chsten Heilung: {0} timeBeforeTeleport=Zeit bis zum n\u00e4chsten Teleport: {0} @@ -369,13 +369,13 @@ timeSet=Zeit in allen Welten gesetzt. timeSetPermission=\u00a7cDu hast keine Berechtigung die Zeit zu \u00e4ndern. timeWorldCurrent=Die momentane Zeit in {0} ist \u00a73{1} timeWorldSet=Die Zeit in \u00a7c{1}\u00a7f wurde zu {0} gesetzt. -tps=Current TPS = {0} +tps=Aktuelle TPS (Ticks pro Sekunde) = {0} tradeCompleted=\u00a77Handel abgeschlossen. tradeSignEmpty=Der Bestand des Trade-Schild ist aufgebraucht. tradeSignEmptyOwner=Es gibt nichts mehr zu Sammeln von diesem Trade-Schild. treeFailure=\u00a7cBaumpflanzung gescheitert. Versuche es auf Gras oder Dreck. treeSpawned=\u00a77Baum gepflanzt. -true=\u00a72true\u00a7f +true=\u00a72ja\u00a7f typeTpaccept=\u00a77Um zu teleportieren, schreibe \u00a7c/tpaccept\u00a77. typeTpdeny=\u00a77Um diese Anfrage abzulehnen, schreibe \u00a7c/tpdeny\u00a77. typeWorldName=\u00a77Du kannst auch den Namen der Welt eingeben. @@ -389,8 +389,8 @@ unknownItemName=Unbekannter Gegenstand: {0} unlimitedItemPermission=\u00a7cDu hast keine Rechte f\u00fcr {0}. unlimitedItems=Unendliche Objekte: unmutedPlayer=Spieler {0} ist nicht mehr stumm. -unvanished=\u00a7aYou are once again visible. -unvanishedReload=\u00a7cA reload has forced you to become visible. +unvanished=\u00a7aDu bist wieder sichtbar. +unvanishedReload=\u00a7cEin Neustart hat dich sichtbar gemacht. upgradingFilesError=Fehler beim Aktualisieren der Dateien userDoesNotExist=Spieler {0} existiert nicht. userIsAway={0} ist abwesend. @@ -400,14 +400,14 @@ userUsedPortal={0} benutzt ein vorhandenes Ausgangsportal. userdataMoveBackError=Verschieben von userdata/{0}.tmp nach userdata/{1} gescheitert. userdataMoveError=Verschieben von userdata/{0} nach userdata/{1}.tmp gescheitert. usingTempFolderForTesting=Benutze tempor\u00e4ren Ordner zum Testen: -vanished=\u00a7aYou have now been vanished. +vanished=\u00a7aDu bist nun unsichtbar! versionMismatch=Versionen nicht identisch! Bitte aktualisiere {0}. versionMismatchAll=Versionen ungleich! Bitte aktualisiere alle Essentials jars auf die gleiche Version. voiceSilenced=\u00a77Du bist stumm warpDeleteError=Fehler beim L\u00f6schen der Warp-Datei. warpListPermission=\u00a7cDu hast keine Berechtigung, die Warp-Punkte anzuzeigen. warpNotExist=Warp-Punkt existiert nicht. -warpOverwrite=\u00a7cYou cannot overwrite that warp. +warpOverwrite=\u00a7cDu kannst diesen Warp-Punkt nicht \u00fcberschreiben. warpSet=\u00a77Warp-Punkt {0} wurde erstellt. warpUsePermission=\u00a7cDu hast keinen Zugriff f\u00fcr diesen Warp-Punkt. warpingTo=\u00a77Teleportiere zu Warp-Punkt {0}. @@ -418,27 +418,27 @@ weatherStormFor=\u00a77In {0} st\u00fcrmt es nun f\u00fcr {1} Sekunden. weatherSun=\u00a77In {0} scheint nun die Sonne. weatherSunFor=\u00a77In {0} scheint nun f\u00fcr {1} Sekunden die Sonne. whoisAFK=\u00a76 - AFK:\u00a7f {0} -whoisBanned=\u00a76 - Banned:\u00a7f {0} -whoisExp=\u00a76 - Exp:\u00a7f {0} (Level {1}) -whoisFly=\u00a76 - Fly mode:\u00a7f {0} ({1}) +whoisBanned=\u00a76 - Gebannt:\u00a7f {0} +whoisExp=\u00a76 - Erfahrungspunkte:\u00a7f {0} (Level {1}) +whoisFly=\u00a76 - Fliegen:\u00a7f {0} ({1}) whoisGamemode=\u00a76 - Gamemode:\u00a7f {0} whoisGeoLocation=\u00a76 - Herkunft:\u00a7f {0} -whoisGod=\u00a76 - God mode:\u00a7f {0} +whoisGod=\u00a76 - Unsterblichkeit:\u00a7f {0} whoisHealth=\u00a76 - Gesundheit:\u00a7f {0}/20 whoisIPAddress=\u00a76 - IP-Adresse:\u00a7f {0} whoisJail=\u00a76 - Jail:\u00a7f {0} whoisLocation=\u00a76 - Position:\u00a7f ({0}, {1}, {2}, {3}) whoisMoney=\u00a76 - Geldb\u00f6rse:\u00a7f {0} -whoisMuted=\u00a76 - Muted:\u00a7f {0} +whoisMuted=\u00a76 - Stumm:\u00a7f {0} whoisNick=\u00a76 - Nick:\u00a7f {0} whoisOp=\u00a76 - OP:\u00a7f {0} whoisTop=\u00a76 ====== WhoIs:\u00a7f {0} \u00a76====== -worth=\u00a77Stack of {0} worth \u00a7c{1}\u00a77 ({2} item(s) at {3} each) +worth=\u00a77Der Wert von {0} betr\u00e4gt: \u00a7c{1}\u00a77 ({3} pro {2} Gegenst\u00e4nde) worthMeta=\u00a77Ein Stapel von {0} mit Metadaten {1} ist \u00a7c{2}\u00a77 wert. ({3} Einheiten je {4}) worthSet=Wert des Gegenstands gesetzt. year=Jahr years=Jahre youAreHealed=\u00a77Du wurdest geheilt. youHaveNewMail=\u00a7cDu hast {0} Nachrichten!\u00a7f Schreibe \u00a77/mail read\u00a7f um deine Nachrichten anzuzeigen. -hatRemoved=\u00a7eYour hat has been removed. -banFormat=Banned: {0} +hatRemoved=\u00a7eDein Hut wurde entfernt. +banFormat=Gesperrt: {0}
\ No newline at end of file diff --git a/Essentials/src/net/ess3/Essentials.java b/Essentials/src/net/ess3/Essentials.java index 89a1e6460..92c8f90f9 100644 --- a/Essentials/src/net/ess3/Essentials.java +++ b/Essentials/src/net/ess3/Essentials.java @@ -17,6 +17,16 @@ */ package net.ess3; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import lombok.Getter; import static net.ess3.I18n._; import net.ess3.api.*; import net.ess3.backup.Backup; @@ -32,20 +42,8 @@ import net.ess3.metrics.MetricsStarter; import net.ess3.ranks.RanksStorage; import net.ess3.settings.SettingsHolder; import net.ess3.settings.SpawnsHolder; -import net.ess3.user.IOfflinePlayer; -import net.ess3.user.User; import net.ess3.user.UserMap; import net.ess3.utils.ExecuteTimer; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import lombok.Getter; import org.bukkit.Server; import org.bukkit.World; import org.bukkit.command.Command; @@ -345,61 +343,17 @@ public class Essentials extends JavaPlugin implements IEssentials } @Override - public IUser getUser(final Object base) + public IUser getUser(final Player player) { - if (base instanceof Player) - { - return getUser((Player)base); - } - if (base instanceof String) - { - final IUser user = userMap.getUser((String)base); - if (user != null && user.getBase() instanceof IOfflinePlayer) - { - ((IOfflinePlayer)user.getBase()).setName((String)base); - } - return user; - } - return null; + return userMap.getUser(player); } - private <T extends Player> IUser getUser(final T base) + @Override + public IUser getUser(final String playerName) { - if (base == null) - { - return null; - } - - if (base instanceof IUser) - { - return (IUser)base; - } - IUser user = userMap.getUser(base.getName()); - - if (user == null) - { - user = new User(base, this); - } - else - { - //todo - fix this - user.update(base); - } - return user; + return userMap.getUser(playerName); } - /*@Override - public IUser getUser(final Player player) - { - return userMap.getUser(player); - } - - @Override - public IUser getUser(final String playerName) - { - return userMap.getUser(playerName); - } - */ @Override public World getWorld(final String name) { diff --git a/Essentials/src/net/ess3/EssentialsTimer.java b/Essentials/src/net/ess3/EssentialsTimer.java index 8ec1d303c..a144fe3c7 100644 --- a/Essentials/src/net/ess3/EssentialsTimer.java +++ b/Essentials/src/net/ess3/EssentialsTimer.java @@ -1,17 +1,13 @@ package net.ess3; +import java.util.*; +import java.util.logging.Level; import static net.ess3.I18n._; import net.ess3.api.IEssentials; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.user.UserData.TimestampType; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; -import java.util.logging.Level; import org.bukkit.entity.Player; @@ -40,7 +36,7 @@ public class EssentialsTimer implements Runnable { history.remove(); } - float tps = 100f / timeSpent; + final float tps = 100f / timeSpent; if (tps <= 20) { history.add(tps); @@ -52,6 +48,9 @@ public class EssentialsTimer implements Runnable try { final IUser user = ess.getUser(player); + if (user == null) { + continue; + } onlineUsers.add(user); user.setLastOnlineActivity(currentTime); user.checkActivity(); @@ -68,7 +67,7 @@ public class EssentialsTimer implements Runnable settings.unlock(); } // New mail notification - if (user != null && !mailDisabled && Permissions.MAIL.isAuthorized(user) && !user.gotMailInfo()) + if (!mailDisabled && Permissions.MAIL.isAuthorized(user) && !user.gotMailInfo()) { final List<String> mail = user.getMails(); if (mail != null && !mail.isEmpty()) diff --git a/Essentials/src/net/ess3/I18n.java b/Essentials/src/net/ess3/I18n.java index 0086576a8..949c0754a 100644 --- a/Essentials/src/net/ess3/I18n.java +++ b/Essentials/src/net/ess3/I18n.java @@ -1,7 +1,5 @@ package net.ess3; -import net.ess3.api.IEssentials; -import net.ess3.api.II18n; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -12,6 +10,8 @@ import java.text.MessageFormat; import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; +import net.ess3.api.IEssentials; +import net.ess3.api.II18n; public class I18n implements II18n diff --git a/Essentials/src/net/ess3/ItemDb.java b/Essentials/src/net/ess3/ItemDb.java index 448eb7baa..1513c85cf 100644 --- a/Essentials/src/net/ess3/ItemDb.java +++ b/Essentials/src/net/ess3/ItemDb.java @@ -1,17 +1,17 @@ package net.ess3; -import net.ess3.storage.ManagedFile; -import static net.ess3.I18n._; -import net.ess3.api.IEssentials; -import net.ess3.api.IItemDb; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.regex.Pattern; import lombok.Cleanup; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.IItemDb; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; +import net.ess3.storage.ManagedFile; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/net/ess3/Jails.java b/Essentials/src/net/ess3/Jails.java index 244d40853..d6612475a 100644 --- a/Essentials/src/net/ess3/Jails.java +++ b/Essentials/src/net/ess3/Jails.java @@ -1,19 +1,20 @@ package net.ess3; -import static net.ess3.I18n._; -import net.ess3.api.IEssentials; -import net.ess3.api.IJails; -import net.ess3.api.IUser; -import net.ess3.storage.AsyncStorageObjectHolder; import java.io.File; import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; import lombok.Cleanup; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.IJails; +import net.ess3.api.IUser; +import net.ess3.storage.AsyncStorageObjectHolder; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; +import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; @@ -240,7 +241,7 @@ public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> imp final Entity damager = event.getDamager(); if (damager.getType() == EntityType.PLAYER) { - final IUser user = ess.getUser(damager); + final IUser user = ess.getUser((Player)damager); if (user != null && user.getData().isJailed()) { event.setCancelled(true); diff --git a/Essentials/src/net/ess3/Kits.java b/Essentials/src/net/ess3/Kits.java index fe9c55851..e979ade5f 100644 --- a/Essentials/src/net/ess3/Kits.java +++ b/Essentials/src/net/ess3/Kits.java @@ -1,5 +1,8 @@ package net.ess3; +import java.io.File; +import java.io.IOException; +import java.util.*; import static net.ess3.I18n._; import net.ess3.api.IEssentials; import net.ess3.api.IKits; @@ -9,9 +12,6 @@ import net.ess3.settings.Kit; import net.ess3.storage.AsyncStorageObjectHolder; import net.ess3.user.UserData.TimestampType; import net.ess3.utils.DateUtil; -import java.io.File; -import java.io.IOException; -import java.util.*; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/net/ess3/Teleport.java b/Essentials/src/net/ess3/Teleport.java index e703679cc..0d25e47bc 100644 --- a/Essentials/src/net/ess3/Teleport.java +++ b/Essentials/src/net/ess3/Teleport.java @@ -1,5 +1,8 @@ package net.ess3; +import java.util.Calendar; +import java.util.GregorianCalendar; +import java.util.logging.Logger; import static net.ess3.I18n._; import net.ess3.api.IEssentials; import net.ess3.api.ITeleport; @@ -10,9 +13,6 @@ import net.ess3.user.CooldownException; import net.ess3.user.UserData.TimestampType; import net.ess3.utils.DateUtil; import net.ess3.utils.LocationUtil; -import java.util.Calendar; -import java.util.GregorianCalendar; -import java.util.logging.Logger; import org.bukkit.Location; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/Warps.java b/Essentials/src/net/ess3/Warps.java index 751b762ce..feca7fe49 100644 --- a/Essentials/src/net/ess3/Warps.java +++ b/Essentials/src/net/ess3/Warps.java @@ -1,5 +1,8 @@ package net.ess3; +import java.io.File; +import java.util.*; +import java.util.logging.Logger; import static net.ess3.I18n._; import net.ess3.api.IEssentials; import net.ess3.api.IWarp; @@ -8,9 +11,6 @@ import net.ess3.api.InvalidNameException; import net.ess3.commands.WarpNotFoundException; import net.ess3.settings.WarpHolder; import net.ess3.storage.StorageObjectMap; -import java.io.File; -import java.util.*; -import java.util.logging.Logger; import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/Essentials/src/net/ess3/api/IEssentials.java b/Essentials/src/net/ess3/api/IEssentials.java index 7a8c3ccaf..bc9ccfb6e 100644 --- a/Essentials/src/net/ess3/api/IEssentials.java +++ b/Essentials/src/net/ess3/api/IEssentials.java @@ -1,12 +1,12 @@ package net.ess3.api; +import java.util.List; import net.ess3.EssentialsTimer; import net.ess3.economy.register.Methods; import net.ess3.listener.TntExplodeListener; import net.ess3.metrics.Metrics; -import java.util.List; - import org.bukkit.World; +import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; @@ -14,7 +14,10 @@ public interface IEssentials extends Plugin { void addReloadListener(IReload listener); - IUser getUser(final Object base); + //IUser getUser(final Object base); + IUser getUser(final Player player); + + IUser getUser(final String playerName); int broadcastMessage(IUser sender, String message); diff --git a/Essentials/src/net/ess3/api/IKits.java b/Essentials/src/net/ess3/api/IKits.java index 62ad57321..03919f40d 100644 --- a/Essentials/src/net/ess3/api/IKits.java +++ b/Essentials/src/net/ess3/api/IKits.java @@ -1,8 +1,8 @@ package net.ess3.api; +import java.util.Collection; import net.ess3.commands.NoChargeException; import net.ess3.settings.Kit; -import java.util.Collection; public interface IKits extends IReload diff --git a/Essentials/src/net/ess3/api/IUser.java b/Essentials/src/net/ess3/api/IUser.java index cad866601..4a15050d5 100644 --- a/Essentials/src/net/ess3/api/IUser.java +++ b/Essentials/src/net/ess3/api/IUser.java @@ -1,9 +1,9 @@ package net.ess3.api; +import java.util.List; import net.ess3.storage.IStorageObjectHolder; import net.ess3.user.CooldownException; import net.ess3.user.UserData; -import java.util.List; import org.bukkit.Location; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/backup/Backup.java b/Essentials/src/net/ess3/backup/Backup.java index 454ad127f..17301ed92 100644 --- a/Essentials/src/net/ess3/backup/Backup.java +++ b/Essentials/src/net/ess3/backup/Backup.java @@ -1,9 +1,5 @@ package net.ess3.backup; -import static net.ess3.I18n._; -import net.ess3.api.IBackup; -import net.ess3.api.IEssentials; -import net.ess3.api.ISettings; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -11,6 +7,10 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; import java.util.logging.Logger; import lombok.Cleanup; +import static net.ess3.I18n._; +import net.ess3.api.IBackup; +import net.ess3.api.IEssentials; +import net.ess3.api.ISettings; import org.bukkit.Bukkit; import org.bukkit.Server; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/net/ess3/bukkit/Mob.java b/Essentials/src/net/ess3/bukkit/Mob.java index c618a1038..0dd0bfab6 100644 --- a/Essentials/src/net/ess3/bukkit/Mob.java +++ b/Essentials/src/net/ess3/bukkit/Mob.java @@ -1,13 +1,9 @@ package net.ess3.bukkit; -import static net.ess3.I18n._; -import java.util.Collections; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; +import static net.ess3.I18n._; import org.bukkit.Location; import org.bukkit.Server; import org.bukkit.entity.EntityType; diff --git a/Essentials/src/net/ess3/bukkit/Server.java b/Essentials/src/net/ess3/bukkit/Server.java index 2491a4952..b13ce62fb 100644 --- a/Essentials/src/net/ess3/bukkit/Server.java +++ b/Essentials/src/net/ess3/bukkit/Server.java @@ -1,7 +1,7 @@ package net.ess3.bukkit; -import net.ess3.api.server.IServer; import lombok.Delegate; +import net.ess3.api.server.IServer; public class Server implements IServer { @Delegate diff --git a/Essentials/src/net/ess3/commands/Commandbackup.java b/Essentials/src/net/ess3/commands/Commandbackup.java index 2b1e68750..c93ff4169 100644 --- a/Essentials/src/net/ess3/commands/Commandbackup.java +++ b/Essentials/src/net/ess3/commands/Commandbackup.java @@ -1,9 +1,9 @@ package net.ess3.commands; +import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.IBackup; import net.ess3.api.ISettings; -import lombok.Cleanup; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/net/ess3/commands/Commandbalancetop.java b/Essentials/src/net/ess3/commands/Commandbalancetop.java index 98c3d3d90..02da6d78a 100644 --- a/Essentials/src/net/ess3/commands/Commandbalancetop.java +++ b/Essentials/src/net/ess3/commands/Commandbalancetop.java @@ -1,14 +1,14 @@ package net.ess3.commands; -import static net.ess3.I18n._; -import net.ess3.utils.Util; -import net.ess3.api.IUser; -import net.ess3.utils.textreader.ArrayListInput; -import net.ess3.utils.textreader.TextPager; import java.text.DateFormat; import java.util.*; import java.util.Map.Entry; import java.util.concurrent.locks.ReentrantReadWriteLock; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.utils.Util; +import net.ess3.utils.textreader.ArrayListInput; +import net.ess3.utils.textreader.TextPager; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/net/ess3/commands/Commandban.java b/Essentials/src/net/ess3/commands/Commandban.java index 98d970987..f5cdae710 100644 --- a/Essentials/src/net/ess3/commands/Commandban.java +++ b/Essentials/src/net/ess3/commands/Commandban.java @@ -1,11 +1,11 @@ package net.ess3.commands; +import lombok.Cleanup; import net.ess3.Console; import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.user.Ban; -import lombok.Cleanup; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/commands/Commandbanip.java b/Essentials/src/net/ess3/commands/Commandbanip.java index c55e57440..1123050da 100644 --- a/Essentials/src/net/ess3/commands/Commandbanip.java +++ b/Essentials/src/net/ess3/commands/Commandbanip.java @@ -1,8 +1,8 @@ package net.ess3.commands; +import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.IUser; -import lombok.Cleanup; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/net/ess3/commands/Commandbreak.java b/Essentials/src/net/ess3/commands/Commandbreak.java index 8c90f0571..766eb04e1 100644 --- a/Essentials/src/net/ess3/commands/Commandbreak.java +++ b/Essentials/src/net/ess3/commands/Commandbreak.java @@ -1,9 +1,8 @@ package net.ess3.commands; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; -import static net.ess3.I18n._; - import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.event.block.BlockBreakEvent; diff --git a/Essentials/src/net/ess3/commands/Commandclearinventory.java b/Essentials/src/net/ess3/commands/Commandclearinventory.java index c46eb7206..ea6179357 100644 --- a/Essentials/src/net/ess3/commands/Commandclearinventory.java +++ b/Essentials/src/net/ess3/commands/Commandclearinventory.java @@ -1,9 +1,9 @@ package net.ess3.commands; +import java.util.List; import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; -import java.util.List; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/commands/Commanddelhome.java b/Essentials/src/net/ess3/commands/Commanddelhome.java index b7606def6..4cfdf85d6 100644 --- a/Essentials/src/net/ess3/commands/Commanddelhome.java +++ b/Essentials/src/net/ess3/commands/Commanddelhome.java @@ -1,10 +1,10 @@ package net.ess3.commands; +import java.util.Locale; +import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; -import java.util.Locale; -import lombok.Cleanup; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/commands/Commandeco.java b/Essentials/src/net/ess3/commands/Commandeco.java index 680e5d1b4..724160509 100644 --- a/Essentials/src/net/ess3/commands/Commandeco.java +++ b/Essentials/src/net/ess3/commands/Commandeco.java @@ -1,10 +1,10 @@ package net.ess3.commands; -import net.ess3.api.ISettings; -import net.ess3.api.IUser; -import static net.ess3.I18n._; import java.util.Locale; import lombok.Cleanup; +import static net.ess3.I18n._; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/commands/Commandenchant.java b/Essentials/src/net/ess3/commands/Commandenchant.java index 7e38d13fc..f34ad6a70 100644 --- a/Essentials/src/net/ess3/commands/Commandenchant.java +++ b/Essentials/src/net/ess3/commands/Commandenchant.java @@ -1,14 +1,14 @@ package net.ess3.commands; -import net.ess3.bukkit.Enchantments; -import static net.ess3.I18n._; -import net.ess3.utils.Util; -import net.ess3.api.IUser; -import net.ess3.permissions.EnchantPermissions; import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.TreeSet; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.bukkit.Enchantments; +import net.ess3.permissions.EnchantPermissions; +import net.ess3.utils.Util; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/net/ess3/commands/Commandessentials.java b/Essentials/src/net/ess3/commands/Commandessentials.java index a3dad9d19..3ad56f82e 100644 --- a/Essentials/src/net/ess3/commands/Commandessentials.java +++ b/Essentials/src/net/ess3/commands/Commandessentials.java @@ -1,47 +1,31 @@ package net.ess3.commands; -import static net.ess3.I18n._; -import net.ess3.metrics.Metrics; import java.io.IOException; -import java.util.HashMap; import java.util.Map; - -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.block.Block; +import static net.ess3.I18n._; +import net.ess3.metrics.Metrics; import org.bukkit.command.CommandSender; -import org.bukkit.command.ConsoleCommandSender; -import org.bukkit.entity.Player; public class Commandessentials extends EssentialsCommand { - private transient int taskid; - private final transient Map<Player, Block> noteBlocks = new HashMap<Player, Block>(); - @Override public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception { - if (args.length == 0) { + if (args.length == 0) + { run_disabled(sender, commandLabel, args); } else if (args[0].equalsIgnoreCase("debug")) { run_debug(sender, commandLabel, args); } - else if (args[0].equalsIgnoreCase("nya")) - { - run_nya(sender, commandLabel, args); - } - else if (args[0].equalsIgnoreCase("moo")) - { - run_moo(sender, commandLabel, args); - } else if (args[0].equalsIgnoreCase("opt-out")) { run_optout(sender, commandLabel, args); } - else { + else + { run_reload(sender, commandLabel, args); } } @@ -54,13 +38,15 @@ public class Commandessentials extends EssentialsCommand final StringBuilder disabledCommands = new StringBuilder(); for (Map.Entry<String, String> entry : ess.getCommandHandler().disabledCommands().entrySet()) { - if (disabledCommands.length() > 0) { + if (disabledCommands.length() > 0) + { disabledCommands.append(", "); } disabledCommands.append(entry.getKey()).append(" => ").append(entry.getValue()); } - - if (disabledCommands.length() > 0) { + + if (disabledCommands.length() > 0) + { sender.sendMessage(_("blockList")); sender.sendMessage(disabledCommands.toString()); } @@ -78,114 +64,18 @@ public class Commandessentials extends EssentialsCommand sender.sendMessage(_("essentialsReload", ess.getDescription().getVersion())); } - private void run_nya(final CommandSender sender, final String commandLabel, final String[] args) throws Exception - { - final Map<String, Byte> noteMap = new HashMap<String, Byte>(); - noteMap.put("1F#", (byte)0x0); - noteMap.put("1G", (byte)0x1); - noteMap.put("1G#", (byte)0x2); - noteMap.put("1A", (byte)0x3); - noteMap.put("1A#", (byte)0x4); - noteMap.put("1B", (byte)0x5); - noteMap.put("1C", (byte)0x6); - noteMap.put("1C#", (byte)0x7); - noteMap.put("1D", (byte)0x8); - noteMap.put("1D#", (byte)0x9); - noteMap.put("1E", (byte)0xA); - noteMap.put("1F", (byte)0xB); - noteMap.put("2F#", (byte)(0x0 + 0xC)); - noteMap.put("2G", (byte)(0x1 + 0xC)); - noteMap.put("2G#", (byte)(0x2 + 0xC)); - noteMap.put("2A", (byte)(0x3 + 0xC)); - noteMap.put("2A#", (byte)(0x4 + 0xC)); - noteMap.put("2B", (byte)(0x5 + 0xC)); - noteMap.put("2C", (byte)(0x6 + 0xC)); - noteMap.put("2C#", (byte)(0x7 + 0xC)); - noteMap.put("2D", (byte)(0x8 + 0xC)); - noteMap.put("2D#", (byte)(0x9 + 0xC)); - noteMap.put("2E", (byte)(0xA + 0xC)); - noteMap.put("2F", (byte)(0xB + 0xC)); - if (!noteBlocks.isEmpty()) - { - return; - } - final String tuneStr = "1D#,1E,2F#,,2A#,1E,1D#,1E,2F#,2B,2D#,2E,2D#,2A#,2B,,2F#,,1D#,1E,2F#,2B,2C#,2A#,2B,2C#,2E,2D#,2E,2C#,,2F#,,2G#,,1D,1D#,,1C#,1D,1C#,1B,,1B,,1C#,,1D,,1D,1C#,1B,1C#,1D#,2F#,2G#,1D#,2F#,1C#,1D#,1B,1C#,1B,1D#,,2F#,,2G#,1D#,2F#,1C#,1D#,1B,1D,1D#,1D,1C#,1B,1C#,1D,,1B,1C#,1D#,2F#,1C#,1D,1C#,1B,1C#,,1B,,1C#,,2F#,,2G#,,1D,1D#,,1C#,1D,1C#,1B,,1B,,1C#,,1D,,1D,1C#,1B,1C#,1D#,2F#,2G#,1D#,2F#,1C#,1D#,1B,1C#,1B,1D#,,2F#,,2G#,1D#,2F#,1C#,1D#,1B,1D,1D#,1D,1C#,1B,1C#,1D,,1B,1C#,1D#,2F#,1C#,1D,1C#,1B,1C#,,1B,,1B,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1B,,"; - final String[] tune = tuneStr.split(","); - for (Player player : server.getOnlinePlayers()) - { - final Location loc = player.getLocation(); - loc.add(0, 3, 0); - while (loc.getBlockY() < player.getLocation().getBlockY() + 10 && loc.getBlock().getTypeId() != 0) - { - loc.add(0, 1, 0); - } - if (loc.getBlock().getTypeId() == 0) - { - noteBlocks.put(player, loc.getBlock()); - loc.getBlock().setType(Material.NOTE_BLOCK); - } - } - taskid = ess.scheduleSyncRepeatingTask(new Runnable() - { - int i = 0; - - @Override - public void run() - { - final String note = tune[i]; - i++; - if (i >= tune.length) - { - Commandessentials.this.stopTune(); - } - if (note.isEmpty()) - { - return; - } - Map<Player, Block> noteBlocks = Commandessentials.this.noteBlocks; - for (Player onlinePlayer : server.getOnlinePlayers()) - { - final Block block = noteBlocks.get(onlinePlayer); - if (block == null || block.getType() != Material.NOTE_BLOCK) - { - continue; - } - onlinePlayer.playNote(block.getLocation(), (byte)0, noteMap.get(note)); - } - } - }, 20, 2); - } - - private void stopTune() - { - server.getScheduler().cancelTask(taskid); - for (Block block : noteBlocks.values()) - { - if (block.getType() == Material.NOTE_BLOCK) - { - block.setType(Material.AIR); - } - } - noteBlocks.clear(); - } - - private void run_moo(final CommandSender sender, final String command, final String args[]) - { - if(sender instanceof ConsoleCommandSender) - sender.sendMessage(new String[]{" (__)", " (oo)", " /------\\/", " / | ||", " * /\\---/\\", " ~~ ~~", "....\"Have you mooed today?\"..." } ); - else - sender.sendMessage(new String[]{" (__)", " (oo)", " /------\\/", " / | | |", " * /\\---/\\", " ~~ ~~", "....\"Have you mooed today?\"..." } ); - } - private void run_optout(final CommandSender sender, final String command, final String args[]) { final Metrics metrics = ess.getMetrics(); try { sender.sendMessage("Essentials collects simple metrics to highlight which features to concentrate work on in the future."); - if (metrics.isOptOut()) { - metrics.enable(); - } else { + if (metrics.isOptOut()) + { + metrics.enable(); + } + else + { metrics.disable(); } sender.sendMessage("Anonymous Metrics are now: " + (metrics.isOptOut() ? "disabled" : "enabled")); diff --git a/Essentials/src/net/ess3/commands/Commandfeed.java b/Essentials/src/net/ess3/commands/Commandfeed.java index 55bca0932..31f12f9b7 100644 --- a/Essentials/src/net/ess3/commands/Commandfeed.java +++ b/Essentials/src/net/ess3/commands/Commandfeed.java @@ -1,9 +1,9 @@ package net.ess3.commands; +import java.util.List; import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; -import java.util.List; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/commands/Commandgamemode.java b/Essentials/src/net/ess3/commands/Commandgamemode.java index 535afeb77..cfa4c796b 100644 --- a/Essentials/src/net/ess3/commands/Commandgamemode.java +++ b/Essentials/src/net/ess3/commands/Commandgamemode.java @@ -1,9 +1,9 @@ package net.ess3.commands; +import java.util.Locale; import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; -import java.util.Locale; import org.bukkit.GameMode; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/commands/Commandgive.java b/Essentials/src/net/ess3/commands/Commandgive.java index 13f5572c4..6512959d6 100644 --- a/Essentials/src/net/ess3/commands/Commandgive.java +++ b/Essentials/src/net/ess3/commands/Commandgive.java @@ -1,10 +1,10 @@ package net.ess3.commands; +import java.util.Locale; import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.GivePermissions; import net.ess3.utils.Util; -import java.util.Locale; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/net/ess3/commands/Commandheal.java b/Essentials/src/net/ess3/commands/Commandheal.java index 3fcb30999..41a744163 100644 --- a/Essentials/src/net/ess3/commands/Commandheal.java +++ b/Essentials/src/net/ess3/commands/Commandheal.java @@ -1,10 +1,10 @@ package net.ess3.commands; +import java.util.List; import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.user.UserData.TimestampType; -import java.util.List; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/commands/Commandhelp.java b/Essentials/src/net/ess3/commands/Commandhelp.java index 7c2248e49..25f9640c2 100644 --- a/Essentials/src/net/ess3/commands/Commandhelp.java +++ b/Essentials/src/net/ess3/commands/Commandhelp.java @@ -1,14 +1,10 @@ package net.ess3.commands; +import java.util.Locale; import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.utils.Util; -import net.ess3.utils.textreader.HelpInput; -import net.ess3.utils.textreader.IText; -import net.ess3.utils.textreader.KeywordReplacer; -import net.ess3.utils.textreader.TextInput; -import net.ess3.utils.textreader.TextPager; -import java.util.Locale; +import net.ess3.utils.textreader.*; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/net/ess3/commands/Commandhelpop.java b/Essentials/src/net/ess3/commands/Commandhelpop.java index b720ab590..195c4b15e 100644 --- a/Essentials/src/net/ess3/commands/Commandhelpop.java +++ b/Essentials/src/net/ess3/commands/Commandhelpop.java @@ -1,10 +1,10 @@ package net.ess3.commands; +import java.util.logging.Level; import static net.ess3.I18n._; -import net.ess3.utils.Util; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; -import java.util.logging.Level; +import net.ess3.utils.Util; import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/commands/Commandhome.java b/Essentials/src/net/ess3/commands/Commandhome.java index 4d3ddd0c1..9d1459659 100644 --- a/Essentials/src/net/ess3/commands/Commandhome.java +++ b/Essentials/src/net/ess3/commands/Commandhome.java @@ -1,14 +1,13 @@ package net.ess3.commands; +import java.util.List; +import java.util.Locale; import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; import net.ess3.permissions.WorldPermissions; import net.ess3.utils.Util; - -import java.util.List; -import java.util.Locale; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/net/ess3/commands/Commanditem.java b/Essentials/src/net/ess3/commands/Commanditem.java index df371a752..a2339e976 100644 --- a/Essentials/src/net/ess3/commands/Commanditem.java +++ b/Essentials/src/net/ess3/commands/Commanditem.java @@ -1,10 +1,10 @@ package net.ess3.commands; +import java.util.Locale; import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.ItemPermissions; import net.ess3.permissions.Permissions; -import java.util.Locale; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/net/ess3/commands/Commandjump.java b/Essentials/src/net/ess3/commands/Commandjump.java index de5a1c0d3..e8dff4eab 100644 --- a/Essentials/src/net/ess3/commands/Commandjump.java +++ b/Essentials/src/net/ess3/commands/Commandjump.java @@ -1,8 +1,8 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.economy.Trade; import net.ess3.api.IUser; +import net.ess3.economy.Trade; import net.ess3.utils.LocationUtil; import org.bukkit.Location; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/net/ess3/commands/Commandkick.java b/Essentials/src/net/ess3/commands/Commandkick.java index d6703aa19..af29700c2 100644 --- a/Essentials/src/net/ess3/commands/Commandkick.java +++ b/Essentials/src/net/ess3/commands/Commandkick.java @@ -2,7 +2,6 @@ package net.ess3.commands; import net.ess3.Console; import static net.ess3.I18n._; - import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/net/ess3/commands/Commandkillall.java b/Essentials/src/net/ess3/commands/Commandkillall.java index 5388af0c6..ec624915a 100644 --- a/Essentials/src/net/ess3/commands/Commandkillall.java +++ b/Essentials/src/net/ess3/commands/Commandkillall.java @@ -1,9 +1,9 @@ package net.ess3.commands; -import static net.ess3.I18n._; -import net.ess3.bukkit.Mob; import java.util.Collections; import java.util.Locale; +import static net.ess3.I18n._; +import net.ess3.bukkit.Mob; import org.bukkit.Chunk; import org.bukkit.World; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/net/ess3/commands/Commandkit.java b/Essentials/src/net/ess3/commands/Commandkit.java index ca620165a..9856bdb1a 100644 --- a/Essentials/src/net/ess3/commands/Commandkit.java +++ b/Essentials/src/net/ess3/commands/Commandkit.java @@ -1,13 +1,13 @@ package net.ess3.commands; +import java.util.Collection; +import java.util.Locale; import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.permissions.KitPermissions; import net.ess3.settings.Kit; import net.ess3.utils.Util; -import java.util.Collection; -import java.util.Locale; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/net/ess3/commands/Commandkittycannon.java b/Essentials/src/net/ess3/commands/Commandkittycannon.java index 74a3e7935..f8b12dfdf 100644 --- a/Essentials/src/net/ess3/commands/Commandkittycannon.java +++ b/Essentials/src/net/ess3/commands/Commandkittycannon.java @@ -1,9 +1,9 @@ package net.ess3.commands; +import java.util.Random; import net.ess3.api.IUser; import net.ess3.bukkit.Mob; -import java.util.Random; import org.bukkit.Location; import org.bukkit.entity.Ocelot; diff --git a/Essentials/src/net/ess3/commands/Commandlightning.java b/Essentials/src/net/ess3/commands/Commandlightning.java index 3ac1b0494..f66cfa642 100644 --- a/Essentials/src/net/ess3/commands/Commandlightning.java +++ b/Essentials/src/net/ess3/commands/Commandlightning.java @@ -1,10 +1,10 @@ package net.ess3.commands; +import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; -import lombok.Cleanup; import org.bukkit.command.CommandSender; import org.bukkit.entity.LightningStrike; import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/commands/Commandlist.java b/Essentials/src/net/ess3/commands/Commandlist.java index 5221ecad8..ea4deeefc 100644 --- a/Essentials/src/net/ess3/commands/Commandlist.java +++ b/Essentials/src/net/ess3/commands/Commandlist.java @@ -1,11 +1,11 @@ package net.ess3.commands; +import java.util.*; import static net.ess3.I18n._; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.utils.Util; -import java.util.*; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/commands/Commandmail.java b/Essentials/src/net/ess3/commands/Commandmail.java index 722f61403..17f1aac49 100644 --- a/Essentials/src/net/ess3/commands/Commandmail.java +++ b/Essentials/src/net/ess3/commands/Commandmail.java @@ -1,11 +1,10 @@ package net.ess3.commands; +import java.util.List; import static net.ess3.I18n._; -import net.ess3.utils.Util; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; -import java.util.List; - +import net.ess3.utils.Util; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/commands/Commandme.java b/Essentials/src/net/ess3/commands/Commandme.java index fb62ec234..1c6666d2b 100644 --- a/Essentials/src/net/ess3/commands/Commandme.java +++ b/Essentials/src/net/ess3/commands/Commandme.java @@ -1,9 +1,9 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.utils.Util; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; +import net.ess3.utils.Util; public class Commandme extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandmore.java b/Essentials/src/net/ess3/commands/Commandmore.java index fc2d2de00..519c723c7 100644 --- a/Essentials/src/net/ess3/commands/Commandmore.java +++ b/Essentials/src/net/ess3/commands/Commandmore.java @@ -1,11 +1,11 @@ package net.ess3.commands; +import java.util.Locale; import static net.ess3.I18n._; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.ItemPermissions; import net.ess3.permissions.Permissions; -import java.util.Locale; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/net/ess3/commands/Commandmsg.java b/Essentials/src/net/ess3/commands/Commandmsg.java index e4052de89..431720ba2 100644 --- a/Essentials/src/net/ess3/commands/Commandmsg.java +++ b/Essentials/src/net/ess3/commands/Commandmsg.java @@ -1,13 +1,13 @@ package net.ess3.commands; +import java.util.List; +import lombok.Cleanup; import net.ess3.Console; import static net.ess3.I18n._; -import net.ess3.utils.Util; import net.ess3.api.IReplyTo; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; -import java.util.List; -import lombok.Cleanup; +import net.ess3.utils.Util; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -86,7 +86,7 @@ public class Commandmsg extends EssentialsCommand { sender.sendMessage(_("msgFormat", translatedMe, matchedPlayer.getDisplayName(), message)); final IUser matchedUser = ess.getUser(matchedPlayer); - if (sender instanceof Player && (matchedUser.isIgnoringPlayer(ess.getUser(sender)) || matchedUser.isHidden())) + if (sender instanceof Player && (matchedUser.isIgnoringPlayer(ess.getUser((Player)sender)) || matchedUser.isHidden())) { continue; } diff --git a/Essentials/src/net/ess3/commands/Commandmute.java b/Essentials/src/net/ess3/commands/Commandmute.java index 78d13d077..bf574f961 100644 --- a/Essentials/src/net/ess3/commands/Commandmute.java +++ b/Essentials/src/net/ess3/commands/Commandmute.java @@ -1,12 +1,11 @@ package net.ess3.commands; +import lombok.Cleanup; import static net.ess3.I18n._; - import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.user.UserData.TimestampType; import net.ess3.utils.DateUtil; -import lombok.Cleanup; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/net/ess3/commands/Commandnick.java b/Essentials/src/net/ess3/commands/Commandnick.java index e6e3df7f1..3f51b6f1c 100644 --- a/Essentials/src/net/ess3/commands/Commandnick.java +++ b/Essentials/src/net/ess3/commands/Commandnick.java @@ -1,12 +1,12 @@ package net.ess3.commands; +import java.util.Locale; +import lombok.Cleanup; import static net.ess3.I18n._; -import net.ess3.utils.Util; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; -import java.util.Locale; -import lombok.Cleanup; +import net.ess3.utils.Util; import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/commands/Commandnuke.java b/Essentials/src/net/ess3/commands/Commandnuke.java index 9d39b6dca..e5259f134 100644 --- a/Essentials/src/net/ess3/commands/Commandnuke.java +++ b/Essentials/src/net/ess3/commands/Commandnuke.java @@ -1,9 +1,9 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import static net.ess3.I18n._; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/net/ess3/commands/Commandpay.java b/Essentials/src/net/ess3/commands/Commandpay.java index d60f6ea18..76a3e6c0e 100644 --- a/Essentials/src/net/ess3/commands/Commandpay.java +++ b/Essentials/src/net/ess3/commands/Commandpay.java @@ -1,8 +1,8 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.economy.Trade; import net.ess3.api.IUser; +import net.ess3.economy.Trade; import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/commands/Commandpowertool.java b/Essentials/src/net/ess3/commands/Commandpowertool.java index cd8fe57b7..461e335cc 100644 --- a/Essentials/src/net/ess3/commands/Commandpowertool.java +++ b/Essentials/src/net/ess3/commands/Commandpowertool.java @@ -1,12 +1,12 @@ package net.ess3.commands; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.utils.Util; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/net/ess3/commands/Commandptime.java b/Essentials/src/net/ess3/commands/Commandptime.java index 51cd0485f..0399682df 100644 --- a/Essentials/src/net/ess3/commands/Commandptime.java +++ b/Essentials/src/net/ess3/commands/Commandptime.java @@ -1,10 +1,10 @@ package net.ess3.commands; -import net.ess3.utils.DescParseTickFormat; +import java.util.*; import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; -import java.util.*; +import net.ess3.utils.DescParseTickFormat; import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/commands/Commandr.java b/Essentials/src/net/ess3/commands/Commandr.java index 6dbebde81..166232041 100644 --- a/Essentials/src/net/ess3/commands/Commandr.java +++ b/Essentials/src/net/ess3/commands/Commandr.java @@ -2,10 +2,10 @@ package net.ess3.commands; import net.ess3.Console; import static net.ess3.I18n._; -import net.ess3.utils.Util; import net.ess3.api.IReplyTo; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; +import net.ess3.utils.Util; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -57,7 +57,7 @@ public class Commandr extends EssentialsCommand if (target instanceof Player) { IUser player = ess.getUser((Player)target); - if (sender instanceof Player && player.isIgnoringPlayer(ess.getUser(sender))) + if (sender instanceof Player && player.isIgnoringPlayer(ess.getUser((Player)sender))) { return; } diff --git a/Essentials/src/net/ess3/commands/Commandrealname.java b/Essentials/src/net/ess3/commands/Commandrealname.java index 0a5e7c783..0f2e60f7b 100644 --- a/Essentials/src/net/ess3/commands/Commandrealname.java +++ b/Essentials/src/net/ess3/commands/Commandrealname.java @@ -1,11 +1,11 @@ package net.ess3.commands; +import java.util.Locale; +import lombok.Cleanup; import static net.ess3.I18n._; -import net.ess3.utils.Util; import net.ess3.api.ISettings; import net.ess3.api.IUser; -import java.util.Locale; -import lombok.Cleanup; +import net.ess3.utils.Util; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/commands/Commandremove.java b/Essentials/src/net/ess3/commands/Commandremove.java index af8a97d4c..f8b171259 100644 --- a/Essentials/src/net/ess3/commands/Commandremove.java +++ b/Essentials/src/net/ess3/commands/Commandremove.java @@ -1,8 +1,8 @@ package net.ess3.commands; +import java.util.Locale; import static net.ess3.I18n._; import net.ess3.api.IUser; -import java.util.Locale; import org.bukkit.Chunk; import org.bukkit.World; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/net/ess3/commands/Commandrepair.java b/Essentials/src/net/ess3/commands/Commandrepair.java index b523f076b..9762fc767 100644 --- a/Essentials/src/net/ess3/commands/Commandrepair.java +++ b/Essentials/src/net/ess3/commands/Commandrepair.java @@ -1,14 +1,14 @@ package net.ess3.commands; -import net.ess3.api.ChargeException; -import static net.ess3.I18n._; -import net.ess3.economy.Trade; -import net.ess3.utils.Util; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; import java.util.ArrayList; import java.util.List; import java.util.Locale; +import static net.ess3.I18n._; +import net.ess3.api.ChargeException; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; +import net.ess3.permissions.Permissions; +import net.ess3.utils.Util; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/net/ess3/commands/Commandseen.java b/Essentials/src/net/ess3/commands/Commandseen.java index 315fef9c0..d48ede62b 100644 --- a/Essentials/src/net/ess3/commands/Commandseen.java +++ b/Essentials/src/net/ess3/commands/Commandseen.java @@ -1,13 +1,12 @@ package net.ess3.commands; +import lombok.Cleanup; import static net.ess3.I18n._; - import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.storage.Location; import net.ess3.user.UserData.TimestampType; import net.ess3.utils.DateUtil; -import lombok.Cleanup; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/net/ess3/commands/Commandsell.java b/Essentials/src/net/ess3/commands/Commandsell.java index a4e73661d..cc3671629 100644 --- a/Essentials/src/net/ess3/commands/Commandsell.java +++ b/Essentials/src/net/ess3/commands/Commandsell.java @@ -1,12 +1,12 @@ package net.ess3.commands; +import java.util.Locale; +import java.util.logging.Level; import static net.ess3.I18n._; -import net.ess3.economy.Trade; -import net.ess3.utils.Util; import net.ess3.api.IUser; import net.ess3.craftbukkit.InventoryWorkaround; -import java.util.Locale; -import java.util.logging.Level; +import net.ess3.economy.Trade; +import net.ess3.utils.Util; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/net/ess3/commands/Commandsethome.java b/Essentials/src/net/ess3/commands/Commandsethome.java index ed2a3cb16..d140f3d2e 100644 --- a/Essentials/src/net/ess3/commands/Commandsethome.java +++ b/Essentials/src/net/ess3/commands/Commandsethome.java @@ -1,11 +1,11 @@ package net.ess3.commands; -import static net.ess3.I18n._; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; import java.util.HashMap; import java.util.Locale; import lombok.Cleanup; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; public class Commandsethome extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandspawn.java b/Essentials/src/net/ess3/commands/Commandspawn.java index 1f1b4a023..74e15ea6a 100644 --- a/Essentials/src/net/ess3/commands/Commandspawn.java +++ b/Essentials/src/net/ess3/commands/Commandspawn.java @@ -1,8 +1,8 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.economy.Trade; import net.ess3.api.IUser; +import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; import net.ess3.settings.SpawnsHolder; import org.bukkit.Location; diff --git a/Essentials/src/net/ess3/commands/Commandspawner.java b/Essentials/src/net/ess3/commands/Commandspawner.java index f54b7fc55..b7d98a6e3 100644 --- a/Essentials/src/net/ess3/commands/Commandspawner.java +++ b/Essentials/src/net/ess3/commands/Commandspawner.java @@ -1,15 +1,15 @@ package net.ess3.commands; +import java.util.Locale; +import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.ISettings; +import net.ess3.api.IUser; import net.ess3.bukkit.Mob; import net.ess3.economy.Trade; -import net.ess3.api.IUser; import net.ess3.permissions.SpawnerPermissions; import net.ess3.utils.LocationUtil; import net.ess3.utils.Util; -import java.util.Locale; -import lombok.Cleanup; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.CreatureSpawner; diff --git a/Essentials/src/net/ess3/commands/Commandspawnmob.java b/Essentials/src/net/ess3/commands/Commandspawnmob.java index d5b0ed5e2..00b1abd00 100644 --- a/Essentials/src/net/ess3/commands/Commandspawnmob.java +++ b/Essentials/src/net/ess3/commands/Commandspawnmob.java @@ -1,20 +1,22 @@ package net.ess3.commands; +import java.util.HashSet; +import java.util.Locale; +import java.util.Random; +import java.util.Set; import static net.ess3.I18n._; -import net.ess3.bukkit.Mob; -import net.ess3.bukkit.Mob.MobException; import net.ess3.api.ISettings; import net.ess3.api.IUser; +import net.ess3.bukkit.Mob; +import net.ess3.bukkit.Mob.MobException; import net.ess3.permissions.SpawnmobPermissions; import net.ess3.utils.LocationUtil; import net.ess3.utils.Util; -import java.util.HashSet; -import java.util.*; import org.bukkit.DyeColor; import org.bukkit.Location; import org.bukkit.block.Block; -import org.bukkit.entity.*; import org.bukkit.entity.Villager.Profession; +import org.bukkit.entity.*; import org.bukkit.material.Colorable; diff --git a/Essentials/src/net/ess3/commands/Commandsudo.java b/Essentials/src/net/ess3/commands/Commandsudo.java index 15489a184..45d9d5ced 100644 --- a/Essentials/src/net/ess3/commands/Commandsudo.java +++ b/Essentials/src/net/ess3/commands/Commandsudo.java @@ -1,9 +1,8 @@ package net.ess3.commands; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; -import static net.ess3.I18n._; - import org.bukkit.command.CommandSender; import org.bukkit.command.PluginCommand; diff --git a/Essentials/src/net/ess3/commands/Commandtempban.java b/Essentials/src/net/ess3/commands/Commandtempban.java index fb3918231..610759b7a 100644 --- a/Essentials/src/net/ess3/commands/Commandtempban.java +++ b/Essentials/src/net/ess3/commands/Commandtempban.java @@ -2,7 +2,6 @@ package net.ess3.commands; import net.ess3.Console; import static net.ess3.I18n._; - import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.user.Ban; diff --git a/Essentials/src/net/ess3/commands/Commandtime.java b/Essentials/src/net/ess3/commands/Commandtime.java index 48b322e31..29cfda36a 100644 --- a/Essentials/src/net/ess3/commands/Commandtime.java +++ b/Essentials/src/net/ess3/commands/Commandtime.java @@ -1,11 +1,11 @@ package net.ess3.commands; +import java.util.*; import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.utils.DescParseTickFormat; import net.ess3.utils.Util; -import java.util.*; import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -16,10 +16,16 @@ public class Commandtime extends EssentialsCommand @Override public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception { + boolean add = false; final List<String> argList = new ArrayList<String>(Arrays.asList(args)); - if ((argList.remove("set") || argList.remove("add")) && Util.isInt(argList.get(0))) + if (argList.remove("set") && !argList.isEmpty() && Util.isInt(argList.get(0))) + { + argList.set(0, argList.get(0) + "t"); + } + if (argList.remove("add") && !argList.isEmpty() && Util.isInt(argList.get(0))) { - ess.getLogger().info("debug edited 0" + argList.get(0).toString()); + add = true; + argList.set(0, argList.get(0) + "t"); } final String[] validArgs = argList.toArray(new String[0]); @@ -55,7 +61,7 @@ public class Commandtime extends EssentialsCommand throw new NotEnoughArgumentsException(e); } - setWorldsTime(sender, worlds, ticks); + setWorldsTime(sender, worlds, ticks, add); } /** @@ -79,14 +85,17 @@ public class Commandtime extends EssentialsCommand /** * Used to set the time and inform of the change */ - private void setWorldsTime(final CommandSender sender, final Collection<World> worlds, final long ticks) + private void setWorldsTime(final CommandSender sender, final Collection<World> worlds, final long ticks, final boolean add) { // Update the time for (World world : worlds) { long time = world.getTime(); - time -= time % 24000; - world.setTime(time + 24000 + ticks); + if (!add) + { + time -= time % 24000; + } + world.setTime(time + (add ? 0 : 24000) + ticks); } final StringBuilder output = new StringBuilder(); diff --git a/Essentials/src/net/ess3/commands/Commandtogglejail.java b/Essentials/src/net/ess3/commands/Commandtogglejail.java index 1f2d52c49..04d4609a8 100644 --- a/Essentials/src/net/ess3/commands/Commandtogglejail.java +++ b/Essentials/src/net/ess3/commands/Commandtogglejail.java @@ -1,12 +1,11 @@ package net.ess3.commands; +import lombok.Cleanup; import static net.ess3.I18n._; - import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.user.UserData.TimestampType; import net.ess3.utils.DateUtil; -import lombok.Cleanup; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/net/ess3/commands/Commandtop.java b/Essentials/src/net/ess3/commands/Commandtop.java index 3298f8acd..c45ca0864 100644 --- a/Essentials/src/net/ess3/commands/Commandtop.java +++ b/Essentials/src/net/ess3/commands/Commandtop.java @@ -1,8 +1,8 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.economy.Trade; import net.ess3.api.IUser; +import net.ess3.economy.Trade; import org.bukkit.Location; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; @@ -15,7 +15,7 @@ public class Commandtop extends EssentialsCommand final int topX = user.getLocation().getBlockX(); final int topZ = user.getLocation().getBlockZ(); final int topY = user.getWorld().getHighestBlockYAt(topX, topZ); - user.getTeleport().teleport(new Location(user.getWorld(), user.getLocation().getX(), topY + 1, user.getLocation().getZ()), new Trade(commandName, ess), TeleportCause.COMMAND); + user.getTeleport().teleport(new Location(user.getWorld(), user.getLocation().getX(), topY + 1, user.getLocation().getZ(), user.getLocation().getYaw(), user.getLocation().getPitch()), new Trade(commandName, ess), TeleportCause.COMMAND); user.sendMessage(_("teleportTop")); } } diff --git a/Essentials/src/net/ess3/commands/Commandtp.java b/Essentials/src/net/ess3/commands/Commandtp.java index 103202a24..606b2b4d6 100644 --- a/Essentials/src/net/ess3/commands/Commandtp.java +++ b/Essentials/src/net/ess3/commands/Commandtp.java @@ -1,13 +1,13 @@ package net.ess3.commands; +import lombok.Cleanup; import net.ess3.Console; import static net.ess3.I18n._; import net.ess3.api.ISettings; -import net.ess3.economy.Trade; import net.ess3.api.IUser; +import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; import net.ess3.permissions.WorldPermissions; -import lombok.Cleanup; import org.bukkit.command.CommandSender; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/net/ess3/commands/Commandtpa.java b/Essentials/src/net/ess3/commands/Commandtpa.java index 48f17f28d..999b57ec3 100644 --- a/Essentials/src/net/ess3/commands/Commandtpa.java +++ b/Essentials/src/net/ess3/commands/Commandtpa.java @@ -1,10 +1,10 @@ package net.ess3.commands; +import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.WorldPermissions; -import lombok.Cleanup; public class Commandtpa extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandtpaall.java b/Essentials/src/net/ess3/commands/Commandtpaall.java index 36bfd4086..7b81f2b8b 100644 --- a/Essentials/src/net/ess3/commands/Commandtpaall.java +++ b/Essentials/src/net/ess3/commands/Commandtpaall.java @@ -1,10 +1,10 @@ package net.ess3.commands; +import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.WorldPermissions; -import lombok.Cleanup; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/commands/Commandtpaccept.java b/Essentials/src/net/ess3/commands/Commandtpaccept.java index e2a86f5bc..330cf0f70 100644 --- a/Essentials/src/net/ess3/commands/Commandtpaccept.java +++ b/Essentials/src/net/ess3/commands/Commandtpaccept.java @@ -1,12 +1,12 @@ package net.ess3.commands; +import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; import net.ess3.permissions.WorldPermissions; -import lombok.Cleanup; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/net/ess3/commands/Commandtpahere.java b/Essentials/src/net/ess3/commands/Commandtpahere.java index efff0cb50..01e3dd29b 100644 --- a/Essentials/src/net/ess3/commands/Commandtpahere.java +++ b/Essentials/src/net/ess3/commands/Commandtpahere.java @@ -1,10 +1,10 @@ package net.ess3.commands; +import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.WorldPermissions; -import lombok.Cleanup; public class Commandtpahere extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandtpall.java b/Essentials/src/net/ess3/commands/Commandtpall.java index 15d59f1d4..df5f7d526 100644 --- a/Essentials/src/net/ess3/commands/Commandtpall.java +++ b/Essentials/src/net/ess3/commands/Commandtpall.java @@ -1,10 +1,10 @@ package net.ess3.commands; +import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.WorldPermissions; -import lombok.Cleanup; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/net/ess3/commands/Commandtphere.java b/Essentials/src/net/ess3/commands/Commandtphere.java index 856cab2d4..78f4cd748 100644 --- a/Essentials/src/net/ess3/commands/Commandtphere.java +++ b/Essentials/src/net/ess3/commands/Commandtphere.java @@ -1,11 +1,11 @@ package net.ess3.commands; +import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.permissions.WorldPermissions; -import lombok.Cleanup; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/net/ess3/commands/Commandtpo.java b/Essentials/src/net/ess3/commands/Commandtpo.java index b7fdce113..7eba0262f 100644 --- a/Essentials/src/net/ess3/commands/Commandtpo.java +++ b/Essentials/src/net/ess3/commands/Commandtpo.java @@ -1,11 +1,11 @@ package net.ess3.commands; +import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.permissions.WorldPermissions; -import lombok.Cleanup; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/net/ess3/commands/Commandtpohere.java b/Essentials/src/net/ess3/commands/Commandtpohere.java index 734ba32a5..48923e223 100644 --- a/Essentials/src/net/ess3/commands/Commandtpohere.java +++ b/Essentials/src/net/ess3/commands/Commandtpohere.java @@ -1,11 +1,11 @@ package net.ess3.commands; +import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.permissions.WorldPermissions; -import lombok.Cleanup; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/net/ess3/commands/Commandtppos.java b/Essentials/src/net/ess3/commands/Commandtppos.java index 946bf9cbc..bbd0777ca 100644 --- a/Essentials/src/net/ess3/commands/Commandtppos.java +++ b/Essentials/src/net/ess3/commands/Commandtppos.java @@ -1,8 +1,8 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.economy.Trade; import net.ess3.api.IUser; +import net.ess3.economy.Trade; import org.bukkit.Location; import org.bukkit.command.CommandSender; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/net/ess3/commands/Commandunban.java b/Essentials/src/net/ess3/commands/Commandunban.java index c3c6f71a1..9843deb8f 100644 --- a/Essentials/src/net/ess3/commands/Commandunban.java +++ b/Essentials/src/net/ess3/commands/Commandunban.java @@ -1,8 +1,8 @@ package net.ess3.commands; +import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.IUser; -import lombok.Cleanup; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/net/ess3/commands/Commandunbanip.java b/Essentials/src/net/ess3/commands/Commandunbanip.java index 95c5f2e98..d4c6570c9 100644 --- a/Essentials/src/net/ess3/commands/Commandunbanip.java +++ b/Essentials/src/net/ess3/commands/Commandunbanip.java @@ -1,8 +1,8 @@ package net.ess3.commands; +import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.IUser; -import lombok.Cleanup; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/net/ess3/commands/Commandunlimited.java b/Essentials/src/net/ess3/commands/Commandunlimited.java index 74a25d638..6c5ff22a6 100644 --- a/Essentials/src/net/ess3/commands/Commandunlimited.java +++ b/Essentials/src/net/ess3/commands/Commandunlimited.java @@ -1,13 +1,13 @@ package net.ess3.commands; +import java.util.Locale; +import java.util.Set; +import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.craftbukkit.InventoryWorkaround; import net.ess3.permissions.Permissions; import net.ess3.permissions.UnlimitedItemPermissions; -import java.util.Locale; -import java.util.Set; -import lombok.Cleanup; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/net/ess3/commands/Commandwarp.java b/Essentials/src/net/ess3/commands/Commandwarp.java index a6383df43..6176280f6 100644 --- a/Essentials/src/net/ess3/commands/Commandwarp.java +++ b/Essentials/src/net/ess3/commands/Commandwarp.java @@ -1,16 +1,16 @@ package net.ess3.commands; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; import static net.ess3.I18n._; -import net.ess3.economy.Trade; -import net.ess3.utils.Util; import net.ess3.api.IUser; import net.ess3.api.IWarps; +import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; import net.ess3.permissions.WarpPermissions; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; +import net.ess3.utils.Util; import org.bukkit.command.CommandSender; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/net/ess3/commands/Commandwhois.java b/Essentials/src/net/ess3/commands/Commandwhois.java index 18924ac9a..98084479e 100644 --- a/Essentials/src/net/ess3/commands/Commandwhois.java +++ b/Essentials/src/net/ess3/commands/Commandwhois.java @@ -1,15 +1,15 @@ package net.ess3.commands; +import java.util.Locale; +import lombok.Cleanup; import static net.ess3.I18n._; -import net.ess3.utils.Util; import net.ess3.api.ISettings; import net.ess3.api.IUser; +import net.ess3.craftbukkit.SetExpFix; import net.ess3.permissions.Permissions; import net.ess3.user.UserData; import net.ess3.utils.DateUtil; -import net.ess3.craftbukkit.SetExpFix; -import java.util.Locale; -import lombok.Cleanup; +import net.ess3.utils.Util; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/commands/Commandworld.java b/Essentials/src/net/ess3/commands/Commandworld.java index d5e3bd58a..50c5886d7 100644 --- a/Essentials/src/net/ess3/commands/Commandworld.java +++ b/Essentials/src/net/ess3/commands/Commandworld.java @@ -1,10 +1,10 @@ package net.ess3.commands; +import java.util.List; import static net.ess3.I18n._; -import net.ess3.economy.Trade; import net.ess3.api.IUser; +import net.ess3.economy.Trade; import net.ess3.permissions.WorldPermissions; -import java.util.List; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/net/ess3/commands/Commandworth.java b/Essentials/src/net/ess3/commands/Commandworth.java index 211460cae..10ea2c25e 100644 --- a/Essentials/src/net/ess3/commands/Commandworth.java +++ b/Essentials/src/net/ess3/commands/Commandworth.java @@ -1,9 +1,9 @@ package net.ess3.commands; +import java.util.Locale; import static net.ess3.I18n._; -import net.ess3.utils.Util; import net.ess3.api.IUser; -import java.util.Locale; +import net.ess3.utils.Util; import org.bukkit.command.CommandSender; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/net/ess3/commands/EssentialsCommand.java b/Essentials/src/net/ess3/commands/EssentialsCommand.java index 73215060a..cca9e1103 100644 --- a/Essentials/src/net/ess3/commands/EssentialsCommand.java +++ b/Essentials/src/net/ess3/commands/EssentialsCommand.java @@ -1,13 +1,13 @@ package net.ess3.commands; +import java.util.List; +import java.util.logging.Logger; import static net.ess3.I18n._; -import net.ess3.economy.Trade; import net.ess3.api.IEssentials; import net.ess3.api.IEssentialsModule; import net.ess3.api.IUser; +import net.ess3.economy.Trade; import net.ess3.permissions.AbstractSuperpermsPermission; -import java.util.List; -import java.util.logging.Logger; import org.bukkit.Server; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java b/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java index ff4150c99..21d18d706 100644 --- a/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java +++ b/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java @@ -1,11 +1,10 @@ package net.ess3.commands; -import static net.ess3.I18n._; -import net.ess3.api.*; - import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; +import static net.ess3.I18n._; +import net.ess3.api.*; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.Command; diff --git a/Essentials/src/net/ess3/economy/Economy.java b/Essentials/src/net/ess3/economy/Economy.java index 4ba48a3d9..c818dbf75 100644 --- a/Essentials/src/net/ess3/economy/Economy.java +++ b/Essentials/src/net/ess3/economy/Economy.java @@ -1,11 +1,11 @@ package net.ess3.economy; -import net.ess3.utils.Util; -import net.ess3.api.*; -import net.ess3.permissions.Permissions; import java.util.HashMap; import java.util.Locale; import java.util.Map; +import net.ess3.api.*; +import net.ess3.permissions.Permissions; +import net.ess3.utils.Util; public class Economy implements IEconomy diff --git a/Essentials/src/net/ess3/economy/Money.java b/Essentials/src/net/ess3/economy/Money.java index 20eea3544..01da6d5ce 100644 --- a/Essentials/src/net/ess3/economy/Money.java +++ b/Essentials/src/net/ess3/economy/Money.java @@ -1,11 +1,11 @@ package net.ess3.economy; -import net.ess3.storage.MapValueType; -import net.ess3.storage.StorageObject; import java.util.HashMap; import java.util.Map; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.MapValueType; +import net.ess3.storage.StorageObject; @Data diff --git a/Essentials/src/net/ess3/economy/MoneyHolder.java b/Essentials/src/net/ess3/economy/MoneyHolder.java index a17fdb01f..c313e9645 100644 --- a/Essentials/src/net/ess3/economy/MoneyHolder.java +++ b/Essentials/src/net/ess3/economy/MoneyHolder.java @@ -1,9 +1,9 @@ package net.ess3.economy; -import net.ess3.api.IEssentials; -import net.ess3.storage.AsyncStorageObjectHolder; import java.io.File; import java.io.IOException; +import net.ess3.api.IEssentials; +import net.ess3.storage.AsyncStorageObjectHolder; public class MoneyHolder extends AsyncStorageObjectHolder<Money> diff --git a/Essentials/src/net/ess3/economy/Trade.java b/Essentials/src/net/ess3/economy/Trade.java index 9a260ba2b..7b527d46e 100644 --- a/Essentials/src/net/ess3/economy/Trade.java +++ b/Essentials/src/net/ess3/economy/Trade.java @@ -1,14 +1,5 @@ package net.ess3.economy; -import static net.ess3.I18n._; -import net.ess3.api.ChargeException; -import net.ess3.api.IEssentials; -import net.ess3.api.ISettings; -import net.ess3.api.IUser; -import net.ess3.craftbukkit.InventoryWorkaround; -import net.ess3.craftbukkit.SetExpFix; -import net.ess3.permissions.NoCommandCostPermissions; -import net.ess3.permissions.Permissions; import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -19,6 +10,15 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; import lombok.Cleanup; +import static net.ess3.I18n._; +import net.ess3.api.ChargeException; +import net.ess3.api.IEssentials; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.craftbukkit.InventoryWorkaround; +import net.ess3.craftbukkit.SetExpFix; +import net.ess3.permissions.NoCommandCostPermissions; +import net.ess3.permissions.Permissions; import org.bukkit.Location; import org.bukkit.entity.Item; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/net/ess3/economy/Worth.java b/Essentials/src/net/ess3/economy/Worth.java index 91fa254b7..c14873b22 100644 --- a/Essentials/src/net/ess3/economy/Worth.java +++ b/Essentials/src/net/ess3/economy/Worth.java @@ -1,13 +1,13 @@ package net.ess3.economy; -import net.ess3.storage.EnchantmentLevel; -import net.ess3.storage.MapKeyType; -import net.ess3.storage.MapValueType; -import net.ess3.storage.StorageObject; import java.util.HashMap; import java.util.Map; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.EnchantmentLevel; +import net.ess3.storage.MapKeyType; +import net.ess3.storage.MapValueType; +import net.ess3.storage.StorageObject; import org.bukkit.Material; import org.bukkit.material.MaterialData; diff --git a/Essentials/src/net/ess3/economy/WorthHolder.java b/Essentials/src/net/ess3/economy/WorthHolder.java index 59074c77f..dfa3a28a1 100644 --- a/Essentials/src/net/ess3/economy/WorthHolder.java +++ b/Essentials/src/net/ess3/economy/WorthHolder.java @@ -1,13 +1,13 @@ package net.ess3.economy; -import net.ess3.api.IEssentials; -import net.ess3.api.IWorth; -import net.ess3.storage.AsyncStorageObjectHolder; -import net.ess3.storage.EnchantmentLevel; import java.io.File; import java.io.IOException; import java.util.HashMap; import java.util.Map; +import net.ess3.api.IEssentials; +import net.ess3.api.IWorth; +import net.ess3.storage.AsyncStorageObjectHolder; +import net.ess3.storage.EnchantmentLevel; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; import org.bukkit.material.MaterialData; diff --git a/Essentials/src/net/ess3/economy/register/methods/BOSE6.java b/Essentials/src/net/ess3/economy/register/methods/BOSE6.java index 200e8573c..2d8fd4715 100644 --- a/Essentials/src/net/ess3/economy/register/methods/BOSE6.java +++ b/Essentials/src/net/ess3/economy/register/methods/BOSE6.java @@ -1,7 +1,7 @@ package net.ess3.economy.register.methods; -import net.ess3.economy.register.Method; import cosine.boseconomy.BOSEconomy; +import net.ess3.economy.register.Method; import org.bukkit.plugin.Plugin; diff --git a/Essentials/src/net/ess3/economy/register/methods/BOSE7.java b/Essentials/src/net/ess3/economy/register/methods/BOSE7.java index f9092c350..46234bc52 100644 --- a/Essentials/src/net/ess3/economy/register/methods/BOSE7.java +++ b/Essentials/src/net/ess3/economy/register/methods/BOSE7.java @@ -1,7 +1,7 @@ package net.ess3.economy.register.methods; -import net.ess3.economy.register.Method; import cosine.boseconomy.BOSEconomy; +import net.ess3.economy.register.Method; import org.bukkit.plugin.Plugin; diff --git a/Essentials/src/net/ess3/economy/register/methods/MCUR.java b/Essentials/src/net/ess3/economy/register/methods/MCUR.java index 77fed351b..3c6d39fba 100644 --- a/Essentials/src/net/ess3/economy/register/methods/MCUR.java +++ b/Essentials/src/net/ess3/economy/register/methods/MCUR.java @@ -1,8 +1,8 @@ package net.ess3.economy.register.methods; -import net.ess3.economy.register.Method; import me.ashtheking.currency.Currency; import me.ashtheking.currency.CurrencyList; +import net.ess3.economy.register.Method; import org.bukkit.plugin.Plugin; diff --git a/Essentials/src/net/ess3/economy/register/methods/iCo4.java b/Essentials/src/net/ess3/economy/register/methods/iCo4.java index 3972b2432..cf365d322 100644 --- a/Essentials/src/net/ess3/economy/register/methods/iCo4.java +++ b/Essentials/src/net/ess3/economy/register/methods/iCo4.java @@ -1,8 +1,8 @@ package net.ess3.economy.register.methods; -import net.ess3.economy.register.Method; import com.nijiko.coelho.iConomy.iConomy; import com.nijiko.coelho.iConomy.system.Account; +import net.ess3.economy.register.Method; import org.bukkit.plugin.Plugin; diff --git a/Essentials/src/net/ess3/economy/register/methods/iCo5.java b/Essentials/src/net/ess3/economy/register/methods/iCo5.java index 171abfc7c..a25513f36 100644 --- a/Essentials/src/net/ess3/economy/register/methods/iCo5.java +++ b/Essentials/src/net/ess3/economy/register/methods/iCo5.java @@ -1,11 +1,11 @@ package net.ess3.economy.register.methods; -import net.ess3.economy.register.Method; import com.iConomy.iConomy; import com.iConomy.system.Account; import com.iConomy.system.BankAccount; import com.iConomy.system.Holdings; import com.iConomy.util.Constants; +import net.ess3.economy.register.Method; import org.bukkit.plugin.Plugin; diff --git a/Essentials/src/net/ess3/economy/register/methods/iCo6.java b/Essentials/src/net/ess3/economy/register/methods/iCo6.java index 4944a91a9..c68882aa3 100644 --- a/Essentials/src/net/ess3/economy/register/methods/iCo6.java +++ b/Essentials/src/net/ess3/economy/register/methods/iCo6.java @@ -1,10 +1,10 @@ package net.ess3.economy.register.methods; -import net.ess3.economy.register.Method; import com.iCo6.iConomy; import com.iCo6.system.Account; import com.iCo6.system.Accounts; import com.iCo6.system.Holdings; +import net.ess3.economy.register.Method; import org.bukkit.plugin.Plugin; diff --git a/Essentials/src/net/ess3/listener/EssentialsBlockListener.java b/Essentials/src/net/ess3/listener/EssentialsBlockListener.java index e23702135..7f5f55c6e 100644 --- a/Essentials/src/net/ess3/listener/EssentialsBlockListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsBlockListener.java @@ -1,8 +1,8 @@ package net.ess3.listener; -import net.ess3.utils.Util; import net.ess3.api.IEssentials; import net.ess3.api.IUser; +import net.ess3.utils.Util; import org.bukkit.GameMode; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/Essentials/src/net/ess3/listener/EssentialsEntityListener.java b/Essentials/src/net/ess3/listener/EssentialsEntityListener.java index c3f145ea7..a09078438 100644 --- a/Essentials/src/net/ess3/listener/EssentialsEntityListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsEntityListener.java @@ -1,13 +1,13 @@ package net.ess3.listener; +import java.util.List; +import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.IEssentials; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.user.UserData.TimestampType; -import java.util.List; -import lombok.Cleanup; import org.bukkit.Material; import org.bukkit.entity.Ageable; import org.bukkit.entity.Entity; diff --git a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java index 3baaa6898..564a75f34 100644 --- a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java @@ -1,5 +1,13 @@ package net.ess3.listener; +import java.io.IOException; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.logging.Level; +import java.util.logging.Logger; +import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.IEssentials; import net.ess3.api.ISettings; @@ -11,18 +19,9 @@ import net.ess3.utils.textreader.IText; import net.ess3.utils.textreader.KeywordReplacer; import net.ess3.utils.textreader.TextInput; import net.ess3.utils.textreader.TextPager; -import java.io.IOException; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.logging.Level; -import java.util.logging.Logger; -import lombok.Cleanup; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Server; -import org.bukkit.entity.HumanEntity; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -30,8 +29,8 @@ import org.bukkit.event.Listener; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryCloseEvent; import org.bukkit.event.inventory.InventoryType; -import org.bukkit.event.player.*; import org.bukkit.event.player.PlayerLoginEvent.Result; +import org.bukkit.event.player.*; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; @@ -463,11 +462,11 @@ public class EssentialsPlayerListener implements Listener { if (event.getView().getTopInventory().getType() == InventoryType.PLAYER) { - final IUser user = ess.getUser(event.getWhoClicked()); + final IUser user = ess.getUser((Player)event.getWhoClicked()); final InventoryHolder invHolder = event.getView().getTopInventory().getHolder(); - if (invHolder != null && invHolder instanceof HumanEntity) + if (invHolder != null && invHolder instanceof Player) { - final IUser invOwner = ess.getUser((HumanEntity)invHolder); + final IUser invOwner = ess.getUser((Player)invHolder); if (user.isInvSee() && (!Permissions.INVSEE_MODIFY.isAuthorized(user) || Permissions.INVSEE_PREVENT_MODIFY.isAuthorized(invOwner) || !invOwner.isOnline())) @@ -483,7 +482,7 @@ public class EssentialsPlayerListener implements Listener { if (event.getView().getTopInventory().getType() == InventoryType.PLAYER) { - final IUser user = ess.getUser(event.getPlayer()); + final IUser user = ess.getUser((Player)event.getPlayer()); user.setInvSee(false); } } diff --git a/Essentials/src/net/ess3/listener/EssentialsPluginListener.java b/Essentials/src/net/ess3/listener/EssentialsPluginListener.java index 2d5e7a9d4..46b87a28c 100644 --- a/Essentials/src/net/ess3/listener/EssentialsPluginListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsPluginListener.java @@ -1,14 +1,14 @@ package net.ess3.listener; +import java.util.logging.Level; import net.ess3.api.IEssentials; import net.ess3.api.IReload; import net.ess3.api.ISettings; +import net.ess3.economy.register.Methods; import net.ess3.ranks.GMGroups; +import net.ess3.ranks.RanksStorage; import net.ess3.ranks.VaultGroups; -import net.ess3.economy.register.Methods; import net.ess3.settings.General; -import net.ess3.ranks.RanksStorage; -import java.util.logging.Level; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; diff --git a/Essentials/src/net/ess3/listener/TntExplodeListener.java b/Essentials/src/net/ess3/listener/TntExplodeListener.java index fc4609d05..66ef5c284 100644 --- a/Essentials/src/net/ess3/listener/TntExplodeListener.java +++ b/Essentials/src/net/ess3/listener/TntExplodeListener.java @@ -1,7 +1,7 @@ package net.ess3.listener; -import net.ess3.api.IEssentials; import java.util.concurrent.atomic.AtomicBoolean; +import net.ess3.api.IEssentials; import org.bukkit.entity.LivingEntity; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/Essentials/src/net/ess3/metrics/MetricsStarter.java b/Essentials/src/net/ess3/metrics/MetricsStarter.java index 46b1651aa..ed55f9d40 100644 --- a/Essentials/src/net/ess3/metrics/MetricsStarter.java +++ b/Essentials/src/net/ess3/metrics/MetricsStarter.java @@ -1,18 +1,15 @@ package net.ess3.metrics; +import com.nijikokun.bukkit.Permissions.Permissions; +import java.util.Locale; +import java.util.logging.Level; +import lombok.Cleanup; import net.ess3.api.IEssentials; import net.ess3.api.ISettings; import net.ess3.economy.register.Method; import net.ess3.economy.register.methods.VaultEco; import net.ess3.metrics.Metrics.Graph; import net.ess3.metrics.Metrics.Plotter; -//import com.earth2me.essentials.register.payment.Method; -//import com.earth2me.essentials.register.payment.methods.VaultEco; -import com.nijikokun.bukkit.Permissions.Permissions; -import java.util.Locale; -import java.util.logging.Level; - -import lombok.Cleanup; public class MetricsStarter implements Runnable diff --git a/Essentials/src/net/ess3/permissions/AbstractSuperpermsPermission.java b/Essentials/src/net/ess3/permissions/AbstractSuperpermsPermission.java index ca6c33cfa..211ce53aa 100644 --- a/Essentials/src/net/ess3/permissions/AbstractSuperpermsPermission.java +++ b/Essentials/src/net/ess3/permissions/AbstractSuperpermsPermission.java @@ -1,7 +1,7 @@ package net.ess3.permissions; -import net.ess3.utils.Util; import net.ess3.api.IPermission; +import net.ess3.utils.Util; import org.bukkit.command.CommandSender; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; diff --git a/Essentials/src/net/ess3/permissions/EnchantPermissions.java b/Essentials/src/net/ess3/permissions/EnchantPermissions.java index 996477338..cc2095c8e 100644 --- a/Essentials/src/net/ess3/permissions/EnchantPermissions.java +++ b/Essentials/src/net/ess3/permissions/EnchantPermissions.java @@ -1,9 +1,9 @@ package net.ess3.permissions; -import net.ess3.api.IPermission; import java.util.HashMap; import java.util.Locale; import java.util.Map; +import net.ess3.api.IPermission; public class EnchantPermissions diff --git a/Essentials/src/net/ess3/permissions/GivePermissions.java b/Essentials/src/net/ess3/permissions/GivePermissions.java index 231acb8b7..a4cdeb5f6 100644 --- a/Essentials/src/net/ess3/permissions/GivePermissions.java +++ b/Essentials/src/net/ess3/permissions/GivePermissions.java @@ -1,9 +1,9 @@ package net.ess3.permissions; -import net.ess3.api.IPermission; import java.util.EnumMap; import java.util.Locale; import java.util.Map; +import net.ess3.api.IPermission; import org.bukkit.Material; import org.bukkit.permissions.PermissionDefault; diff --git a/Essentials/src/net/ess3/permissions/GroupsPermissions.java b/Essentials/src/net/ess3/permissions/GroupsPermissions.java index 330cb7fb8..ed3095e38 100644 --- a/Essentials/src/net/ess3/permissions/GroupsPermissions.java +++ b/Essentials/src/net/ess3/permissions/GroupsPermissions.java @@ -1,9 +1,9 @@ package net.ess3.permissions; -import net.ess3.api.IPermission; import java.util.HashMap; import java.util.Locale; import java.util.Map; +import net.ess3.api.IPermission; public class GroupsPermissions diff --git a/Essentials/src/net/ess3/permissions/HelpPermissions.java b/Essentials/src/net/ess3/permissions/HelpPermissions.java index 3e7b251bd..3087cd4e9 100644 --- a/Essentials/src/net/ess3/permissions/HelpPermissions.java +++ b/Essentials/src/net/ess3/permissions/HelpPermissions.java @@ -1,9 +1,9 @@ package net.ess3.permissions; -import net.ess3.api.IPermission; import java.util.HashMap; import java.util.Locale; import java.util.Map; +import net.ess3.api.IPermission; public class HelpPermissions diff --git a/Essentials/src/net/ess3/permissions/ItemPermissions.java b/Essentials/src/net/ess3/permissions/ItemPermissions.java index 53ff48ae6..bcc77ef34 100644 --- a/Essentials/src/net/ess3/permissions/ItemPermissions.java +++ b/Essentials/src/net/ess3/permissions/ItemPermissions.java @@ -1,9 +1,9 @@ package net.ess3.permissions; -import net.ess3.api.IPermission; import java.util.EnumMap; import java.util.Locale; import java.util.Map; +import net.ess3.api.IPermission; import org.bukkit.Material; import org.bukkit.permissions.PermissionDefault; diff --git a/Essentials/src/net/ess3/permissions/KitPermissions.java b/Essentials/src/net/ess3/permissions/KitPermissions.java index c01768fa6..00365aeac 100644 --- a/Essentials/src/net/ess3/permissions/KitPermissions.java +++ b/Essentials/src/net/ess3/permissions/KitPermissions.java @@ -1,9 +1,9 @@ package net.ess3.permissions; -import net.ess3.api.IPermission; import java.util.HashMap; import java.util.Locale; import java.util.Map; +import net.ess3.api.IPermission; import org.bukkit.permissions.PermissionDefault; diff --git a/Essentials/src/net/ess3/permissions/Permissions.java b/Essentials/src/net/ess3/permissions/Permissions.java index 3d2ac9160..05e971041 100644 --- a/Essentials/src/net/ess3/permissions/Permissions.java +++ b/Essentials/src/net/ess3/permissions/Permissions.java @@ -1,8 +1,8 @@ package net.ess3.permissions; -import net.ess3.utils.Util; -import net.ess3.api.IPermission; import java.util.Locale; +import net.ess3.api.IPermission; +import net.ess3.utils.Util; import org.bukkit.command.CommandSender; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; diff --git a/Essentials/src/net/ess3/permissions/SpawnerPermissions.java b/Essentials/src/net/ess3/permissions/SpawnerPermissions.java index 67674370a..8e8a4bb1e 100644 --- a/Essentials/src/net/ess3/permissions/SpawnerPermissions.java +++ b/Essentials/src/net/ess3/permissions/SpawnerPermissions.java @@ -1,9 +1,9 @@ package net.ess3.permissions; -import net.ess3.api.IPermission; import java.util.HashMap; import java.util.Locale; import java.util.Map; +import net.ess3.api.IPermission; public class SpawnerPermissions diff --git a/Essentials/src/net/ess3/permissions/SpawnmobPermissions.java b/Essentials/src/net/ess3/permissions/SpawnmobPermissions.java index ce8441706..21bb0b286 100644 --- a/Essentials/src/net/ess3/permissions/SpawnmobPermissions.java +++ b/Essentials/src/net/ess3/permissions/SpawnmobPermissions.java @@ -1,9 +1,9 @@ package net.ess3.permissions; -import net.ess3.api.IPermission; import java.util.HashMap; import java.util.Locale; import java.util.Map; +import net.ess3.api.IPermission; public class SpawnmobPermissions { private static Map<String, IPermission> permissions = new HashMap<String, IPermission>(); diff --git a/Essentials/src/net/ess3/permissions/UnlimitedItemPermissions.java b/Essentials/src/net/ess3/permissions/UnlimitedItemPermissions.java index 02d6ec9b0..e6c1b3bff 100644 --- a/Essentials/src/net/ess3/permissions/UnlimitedItemPermissions.java +++ b/Essentials/src/net/ess3/permissions/UnlimitedItemPermissions.java @@ -1,9 +1,9 @@ package net.ess3.permissions; -import net.ess3.api.IPermission; import java.util.EnumMap; import java.util.Locale; import java.util.Map; +import net.ess3.api.IPermission; import org.bukkit.Material; public class UnlimitedItemPermissions diff --git a/Essentials/src/net/ess3/permissions/WarpPermissions.java b/Essentials/src/net/ess3/permissions/WarpPermissions.java index f8d146b61..c87d78437 100644 --- a/Essentials/src/net/ess3/permissions/WarpPermissions.java +++ b/Essentials/src/net/ess3/permissions/WarpPermissions.java @@ -1,9 +1,9 @@ package net.ess3.permissions; -import net.ess3.api.IPermission; import java.util.HashMap; import java.util.Locale; import java.util.Map; +import net.ess3.api.IPermission; import org.bukkit.permissions.PermissionDefault; diff --git a/Essentials/src/net/ess3/permissions/WorldPermissions.java b/Essentials/src/net/ess3/permissions/WorldPermissions.java index d86e22546..a4d14a174 100644 --- a/Essentials/src/net/ess3/permissions/WorldPermissions.java +++ b/Essentials/src/net/ess3/permissions/WorldPermissions.java @@ -1,9 +1,9 @@ package net.ess3.permissions; -import net.ess3.api.IPermission; import java.util.HashMap; import java.util.Locale; import java.util.Map; +import net.ess3.api.IPermission; public class WorldPermissions { diff --git a/Essentials/src/net/ess3/ranks/GMGroups.java b/Essentials/src/net/ess3/ranks/GMGroups.java index 8c07555e3..650ebac11 100644 --- a/Essentials/src/net/ess3/ranks/GMGroups.java +++ b/Essentials/src/net/ess3/ranks/GMGroups.java @@ -1,12 +1,12 @@ package net.ess3.ranks; -import net.ess3.utils.Util; +import java.text.MessageFormat; +import lombok.Cleanup; import net.ess3.api.IEssentials; import net.ess3.api.IRanks; import net.ess3.api.ISettings; import net.ess3.api.IUser; -import java.text.MessageFormat; -import lombok.Cleanup; +import net.ess3.utils.Util; import org.anjocaido.groupmanager.GroupManager; import org.anjocaido.groupmanager.permissions.AnjoPermissionsHandler; import org.bukkit.plugin.Plugin; diff --git a/Essentials/src/net/ess3/ranks/RankOptions.java b/Essentials/src/net/ess3/ranks/RankOptions.java index a8a8c3298..c22e493f5 100644 --- a/Essentials/src/net/ess3/ranks/RankOptions.java +++ b/Essentials/src/net/ess3/ranks/RankOptions.java @@ -1,9 +1,9 @@ package net.ess3.ranks; -import net.ess3.storage.Comment; -import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; @Data diff --git a/Essentials/src/net/ess3/ranks/Ranks.java b/Essentials/src/net/ess3/ranks/Ranks.java index a77f09846..fffe8fd4a 100644 --- a/Essentials/src/net/ess3/ranks/Ranks.java +++ b/Essentials/src/net/ess3/ranks/Ranks.java @@ -1,11 +1,11 @@ package net.ess3.ranks; -import net.ess3.storage.Comment; -import net.ess3.storage.MapValueType; -import net.ess3.storage.StorageObject; import java.util.LinkedHashMap; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.Comment; +import net.ess3.storage.MapValueType; +import net.ess3.storage.StorageObject; @Data diff --git a/Essentials/src/net/ess3/ranks/RanksStorage.java b/Essentials/src/net/ess3/ranks/RanksStorage.java index 85d5743b5..b4293bedf 100644 --- a/Essentials/src/net/ess3/ranks/RanksStorage.java +++ b/Essentials/src/net/ess3/ranks/RanksStorage.java @@ -1,12 +1,5 @@ package net.ess3.ranks; -import net.ess3.utils.Util; -import net.ess3.api.IEssentials; -import net.ess3.api.IRanks; -import net.ess3.api.ISettings; -import net.ess3.api.IUser; -import net.ess3.permissions.GroupsPermissions; -import net.ess3.storage.AsyncStorageObjectHolder; import java.io.File; import java.text.MessageFormat; import java.util.ArrayList; @@ -15,6 +8,13 @@ import java.util.Collections; import java.util.Map; import java.util.Map.Entry; import lombok.Cleanup; +import net.ess3.api.IEssentials; +import net.ess3.api.IRanks; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.permissions.GroupsPermissions; +import net.ess3.storage.AsyncStorageObjectHolder; +import net.ess3.utils.Util; public class RanksStorage extends AsyncStorageObjectHolder<Ranks> implements IRanks diff --git a/Essentials/src/net/ess3/ranks/VaultGroups.java b/Essentials/src/net/ess3/ranks/VaultGroups.java index 30f526686..c0710517c 100644 --- a/Essentials/src/net/ess3/ranks/VaultGroups.java +++ b/Essentials/src/net/ess3/ranks/VaultGroups.java @@ -1,12 +1,12 @@ package net.ess3.ranks; -import net.ess3.utils.Util; +import java.text.MessageFormat; +import lombok.Cleanup; import net.ess3.api.IEssentials; import net.ess3.api.IRanks; import net.ess3.api.ISettings; import net.ess3.api.IUser; -import java.text.MessageFormat; -import lombok.Cleanup; +import net.ess3.utils.Util; import net.milkbowl.vault.chat.Chat; import org.bukkit.plugin.RegisteredServiceProvider; diff --git a/Essentials/src/net/ess3/settings/Backup.java b/Essentials/src/net/ess3/settings/Backup.java index 9b2ce28cf..a3e147c22 100644 --- a/Essentials/src/net/ess3/settings/Backup.java +++ b/Essentials/src/net/ess3/settings/Backup.java @@ -1,9 +1,9 @@ package net.ess3.settings; -import net.ess3.storage.Comment; -import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; @Data diff --git a/Essentials/src/net/ess3/settings/Chat.java b/Essentials/src/net/ess3/settings/Chat.java index 44bafc395..78b970582 100644 --- a/Essentials/src/net/ess3/settings/Chat.java +++ b/Essentials/src/net/ess3/settings/Chat.java @@ -1,9 +1,9 @@ package net.ess3.settings; -import net.ess3.storage.Comment; -import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; @Data diff --git a/Essentials/src/net/ess3/settings/Commands.java b/Essentials/src/net/ess3/settings/Commands.java index 899ba6b1d..c67ca2da3 100644 --- a/Essentials/src/net/ess3/settings/Commands.java +++ b/Essentials/src/net/ess3/settings/Commands.java @@ -1,13 +1,13 @@ package net.ess3.settings; -import net.ess3.settings.commands.*; -import net.ess3.storage.Comment; -import net.ess3.storage.ListType; -import net.ess3.storage.StorageObject; import java.util.ArrayList; import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.settings.commands.*; +import net.ess3.storage.Comment; +import net.ess3.storage.ListType; +import net.ess3.storage.StorageObject; @Data diff --git a/Essentials/src/net/ess3/settings/Economy.java b/Essentials/src/net/ess3/settings/Economy.java index d1eced963..ffbd57045 100644 --- a/Essentials/src/net/ess3/settings/Economy.java +++ b/Essentials/src/net/ess3/settings/Economy.java @@ -1,13 +1,13 @@ package net.ess3.settings; -import net.ess3.economy.Worth; -import net.ess3.storage.Comment; -import net.ess3.storage.MapValueType; -import net.ess3.storage.StorageObject; import java.util.HashMap; import java.util.Map; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.economy.Worth; +import net.ess3.storage.Comment; +import net.ess3.storage.MapValueType; +import net.ess3.storage.StorageObject; @Data diff --git a/Essentials/src/net/ess3/settings/General.java b/Essentials/src/net/ess3/settings/General.java index 2f247ec57..ccb91c0f2 100644 --- a/Essentials/src/net/ess3/settings/General.java +++ b/Essentials/src/net/ess3/settings/General.java @@ -1,11 +1,11 @@ package net.ess3.settings; -import net.ess3.storage.Comment; -import net.ess3.storage.StorageObject; import java.util.HashMap; import java.util.Map; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; import org.bukkit.entity.EntityType; diff --git a/Essentials/src/net/ess3/settings/Jails.java b/Essentials/src/net/ess3/settings/Jails.java index a6e1f5c82..6bcad4d4a 100644 --- a/Essentials/src/net/ess3/settings/Jails.java +++ b/Essentials/src/net/ess3/settings/Jails.java @@ -1,12 +1,12 @@ package net.ess3.settings; -import net.ess3.storage.Location; -import net.ess3.storage.MapValueType; -import net.ess3.storage.StorageObject; import java.util.HashMap; import java.util.Map; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.Location; +import net.ess3.storage.MapValueType; +import net.ess3.storage.StorageObject; @Data diff --git a/Essentials/src/net/ess3/settings/Kit.java b/Essentials/src/net/ess3/settings/Kit.java index 0ffff6759..822209eda 100644 --- a/Essentials/src/net/ess3/settings/Kit.java +++ b/Essentials/src/net/ess3/settings/Kit.java @@ -1,11 +1,11 @@ package net.ess3.settings; -import net.ess3.storage.ListType; -import net.ess3.storage.StorageObject; import java.util.ArrayList; import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.ListType; +import net.ess3.storage.StorageObject; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/net/ess3/settings/Kits.java b/Essentials/src/net/ess3/settings/Kits.java index 7992b9867..79abaea59 100644 --- a/Essentials/src/net/ess3/settings/Kits.java +++ b/Essentials/src/net/ess3/settings/Kits.java @@ -1,11 +1,11 @@ package net.ess3.settings; -import net.ess3.storage.MapValueType; -import net.ess3.storage.StorageObject; import java.util.HashMap; import java.util.Map; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.MapValueType; +import net.ess3.storage.StorageObject; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/net/ess3/settings/Settings.java b/Essentials/src/net/ess3/settings/Settings.java index 11705f493..f5d87ba20 100644 --- a/Essentials/src/net/ess3/settings/Settings.java +++ b/Essentials/src/net/ess3/settings/Settings.java @@ -1,12 +1,12 @@ package net.ess3.settings; -import net.ess3.storage.Comment; -import net.ess3.storage.MapValueType; -import net.ess3.storage.StorageObject; import java.util.HashMap; import java.util.Map; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.Comment; +import net.ess3.storage.MapValueType; +import net.ess3.storage.StorageObject; @Data diff --git a/Essentials/src/net/ess3/settings/SettingsHolder.java b/Essentials/src/net/ess3/settings/SettingsHolder.java index 0c0e07cd2..f12baa823 100644 --- a/Essentials/src/net/ess3/settings/SettingsHolder.java +++ b/Essentials/src/net/ess3/settings/SettingsHolder.java @@ -1,10 +1,10 @@ package net.ess3.settings; +import java.io.File; +import java.util.concurrent.atomic.AtomicBoolean; import net.ess3.api.IEssentials; import net.ess3.api.ISettings; import net.ess3.storage.AsyncStorageObjectHolder; -import java.io.File; -import java.util.concurrent.atomic.AtomicBoolean; public class SettingsHolder extends AsyncStorageObjectHolder<Settings> implements ISettings diff --git a/Essentials/src/net/ess3/settings/Spawns.java b/Essentials/src/net/ess3/settings/Spawns.java index 15ee73fe6..4c0239101 100644 --- a/Essentials/src/net/ess3/settings/Spawns.java +++ b/Essentials/src/net/ess3/settings/Spawns.java @@ -1,13 +1,13 @@ package net.ess3.settings; -import net.ess3.storage.Comment; -import net.ess3.storage.Location; -import net.ess3.storage.MapValueType; -import net.ess3.storage.StorageObject; import java.util.HashMap; import java.util.Map; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.Comment; +import net.ess3.storage.Location; +import net.ess3.storage.MapValueType; +import net.ess3.storage.StorageObject; @Data diff --git a/Essentials/src/net/ess3/settings/SpawnsHolder.java b/Essentials/src/net/ess3/settings/SpawnsHolder.java index fd545705d..cc63d98c8 100644 --- a/Essentials/src/net/ess3/settings/SpawnsHolder.java +++ b/Essentials/src/net/ess3/settings/SpawnsHolder.java @@ -1,5 +1,10 @@ package net.ess3.settings; +import java.io.File; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import java.util.logging.Level; import static net.ess3.I18n._; import net.ess3.api.IEssentials; import net.ess3.api.IEssentialsModule; @@ -11,11 +16,6 @@ import net.ess3.utils.textreader.IText; import net.ess3.utils.textreader.KeywordReplacer; import net.ess3.utils.textreader.SimpleTextInput; import net.ess3.utils.textreader.SimpleTextPager; -import java.io.File; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; -import java.util.logging.Level; import org.bukkit.*; import org.bukkit.event.Event; import org.bukkit.event.EventException; diff --git a/Essentials/src/net/ess3/settings/Warp.java b/Essentials/src/net/ess3/settings/Warp.java index 7b5a2f597..963a5420a 100644 --- a/Essentials/src/net/ess3/settings/Warp.java +++ b/Essentials/src/net/ess3/settings/Warp.java @@ -1,9 +1,9 @@ package net.ess3.settings; -import net.ess3.storage.Location; -import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.Location; +import net.ess3.storage.StorageObject; @Data @EqualsAndHashCode(callSuper = false) diff --git a/Essentials/src/net/ess3/settings/WarpHolder.java b/Essentials/src/net/ess3/settings/WarpHolder.java index eaef24b6d..06bf47121 100644 --- a/Essentials/src/net/ess3/settings/WarpHolder.java +++ b/Essentials/src/net/ess3/settings/WarpHolder.java @@ -1,11 +1,11 @@ package net.ess3.settings; +import java.io.File; +import java.io.IOException; import net.ess3.api.IEssentials; import net.ess3.api.IWarp; import net.ess3.api.InvalidNameException; import net.ess3.storage.AsyncStorageObjectHolder; -import java.io.File; -import java.io.IOException; public class WarpHolder extends AsyncStorageObjectHolder<Warp> implements IWarp diff --git a/Essentials/src/net/ess3/settings/Worlds.java b/Essentials/src/net/ess3/settings/Worlds.java index 0d9fdb754..4e624c961 100644 --- a/Essentials/src/net/ess3/settings/Worlds.java +++ b/Essentials/src/net/ess3/settings/Worlds.java @@ -1,8 +1,8 @@ package net.ess3.settings; -import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.StorageObject; @Data @EqualsAndHashCode(callSuper = false) diff --git a/Essentials/src/net/ess3/settings/commands/Afk.java b/Essentials/src/net/ess3/settings/commands/Afk.java index 0b337e049..171926218 100644 --- a/Essentials/src/net/ess3/settings/commands/Afk.java +++ b/Essentials/src/net/ess3/settings/commands/Afk.java @@ -1,9 +1,9 @@ package net.ess3.settings.commands; -import net.ess3.storage.Comment; -import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; @Data diff --git a/Essentials/src/net/ess3/settings/commands/Back.java b/Essentials/src/net/ess3/settings/commands/Back.java index 54a4aa246..e83c53860 100644 --- a/Essentials/src/net/ess3/settings/commands/Back.java +++ b/Essentials/src/net/ess3/settings/commands/Back.java @@ -1,9 +1,9 @@ package net.ess3.settings.commands; -import net.ess3.storage.Comment; -import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; @Data diff --git a/Essentials/src/net/ess3/settings/commands/God.java b/Essentials/src/net/ess3/settings/commands/God.java index 32ab65c97..89b8505ae 100644 --- a/Essentials/src/net/ess3/settings/commands/God.java +++ b/Essentials/src/net/ess3/settings/commands/God.java @@ -1,9 +1,9 @@ package net.ess3.settings.commands; -import net.ess3.storage.Comment; -import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; @Data diff --git a/Essentials/src/net/ess3/settings/commands/Help.java b/Essentials/src/net/ess3/settings/commands/Help.java index 92d5774c7..585426dce 100644 --- a/Essentials/src/net/ess3/settings/commands/Help.java +++ b/Essentials/src/net/ess3/settings/commands/Help.java @@ -1,9 +1,9 @@ package net.ess3.settings.commands; -import net.ess3.storage.Comment; -import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; @Data diff --git a/Essentials/src/net/ess3/settings/commands/Home.java b/Essentials/src/net/ess3/settings/commands/Home.java index f23af4646..8b4c7356b 100644 --- a/Essentials/src/net/ess3/settings/commands/Home.java +++ b/Essentials/src/net/ess3/settings/commands/Home.java @@ -1,9 +1,9 @@ package net.ess3.settings.commands; -import net.ess3.storage.Comment; -import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; @Data diff --git a/Essentials/src/net/ess3/settings/commands/Lightning.java b/Essentials/src/net/ess3/settings/commands/Lightning.java index ee0d2ba3e..5b9e2adf6 100644 --- a/Essentials/src/net/ess3/settings/commands/Lightning.java +++ b/Essentials/src/net/ess3/settings/commands/Lightning.java @@ -1,9 +1,9 @@ package net.ess3.settings.commands; -import net.ess3.storage.Comment; -import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; @Data diff --git a/Essentials/src/net/ess3/settings/commands/List.java b/Essentials/src/net/ess3/settings/commands/List.java index 6258123f8..e2b869aaf 100644 --- a/Essentials/src/net/ess3/settings/commands/List.java +++ b/Essentials/src/net/ess3/settings/commands/List.java @@ -1,10 +1,10 @@ package net.ess3.settings.commands; -import net.ess3.storage.Comment; -import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; @Data diff --git a/Essentials/src/net/ess3/settings/commands/Spawnmob.java b/Essentials/src/net/ess3/settings/commands/Spawnmob.java index 4f9a524f2..a1a870e49 100644 --- a/Essentials/src/net/ess3/settings/commands/Spawnmob.java +++ b/Essentials/src/net/ess3/settings/commands/Spawnmob.java @@ -1,9 +1,9 @@ package net.ess3.settings.commands; -import net.ess3.storage.Comment; -import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; @Data diff --git a/Essentials/src/net/ess3/settings/commands/Tpa.java b/Essentials/src/net/ess3/settings/commands/Tpa.java index b11e71035..5b8795266 100644 --- a/Essentials/src/net/ess3/settings/commands/Tpa.java +++ b/Essentials/src/net/ess3/settings/commands/Tpa.java @@ -1,9 +1,9 @@ package net.ess3.settings.commands; -import net.ess3.storage.Comment; -import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; @Data diff --git a/Essentials/src/net/ess3/settings/geoip/Database.java b/Essentials/src/net/ess3/settings/geoip/Database.java index 089477b25..06c3821f8 100644 --- a/Essentials/src/net/ess3/settings/geoip/Database.java +++ b/Essentials/src/net/ess3/settings/geoip/Database.java @@ -1,8 +1,8 @@ package net.ess3.settings.geoip; -import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.StorageObject; @Data diff --git a/Essentials/src/net/ess3/settings/geoip/GeoIP.java b/Essentials/src/net/ess3/settings/geoip/GeoIP.java index cae4a4df0..04f6f5a77 100644 --- a/Essentials/src/net/ess3/settings/geoip/GeoIP.java +++ b/Essentials/src/net/ess3/settings/geoip/GeoIP.java @@ -1,8 +1,8 @@ package net.ess3.settings.geoip; -import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.StorageObject; @Data diff --git a/Essentials/src/net/ess3/settings/protect/Prevent.java b/Essentials/src/net/ess3/settings/protect/Prevent.java index 37ab8ec1f..f99c43d21 100644 --- a/Essentials/src/net/ess3/settings/protect/Prevent.java +++ b/Essentials/src/net/ess3/settings/protect/Prevent.java @@ -1,14 +1,13 @@ package net.ess3.settings.protect; -import net.ess3.storage.*; -import java.util.HashMap; import java.util.HashSet; -import java.util.Map; import java.util.Set; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.Comment; +import net.ess3.storage.ListType; +import net.ess3.storage.StorageObject; import org.bukkit.Material; -import org.bukkit.entity.EntityType; @Data diff --git a/Essentials/src/net/ess3/settings/protect/Protect.java b/Essentials/src/net/ess3/settings/protect/Protect.java index ab5a061fd..3447979be 100644 --- a/Essentials/src/net/ess3/settings/protect/Protect.java +++ b/Essentials/src/net/ess3/settings/protect/Protect.java @@ -1,12 +1,12 @@ package net.ess3.settings.protect; -import net.ess3.storage.Comment; -import net.ess3.storage.ListType; -import net.ess3.storage.StorageObject; import java.util.HashSet; import java.util.Set; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.Comment; +import net.ess3.storage.ListType; +import net.ess3.storage.StorageObject; import org.bukkit.Material; diff --git a/Essentials/src/net/ess3/settings/protect/SignsAndRails.java b/Essentials/src/net/ess3/settings/protect/SignsAndRails.java index aba39305d..148da7bc9 100644 --- a/Essentials/src/net/ess3/settings/protect/SignsAndRails.java +++ b/Essentials/src/net/ess3/settings/protect/SignsAndRails.java @@ -1,9 +1,9 @@ package net.ess3.settings.protect; -import net.ess3.storage.Comment; -import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; @Data diff --git a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java index d87f421f2..58fcb6020 100644 --- a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java +++ b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java @@ -1,13 +1,13 @@ package net.ess3.storage; -import net.ess3.Essentials; -import net.ess3.api.IEssentials; import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Level; +import net.ess3.Essentials; +import net.ess3.api.IEssentials; import org.bukkit.Bukkit; diff --git a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java index 19f40cd68..bc8a0f18a 100644 --- a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java +++ b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java @@ -1,14 +1,13 @@ package net.ess3.storage; -import net.ess3.Essentials; -import net.ess3.api.IEssentials; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.io.PrintWriter; import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Level; - +import net.ess3.Essentials; +import net.ess3.api.IEssentials; import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; diff --git a/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java b/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java index 9b7f25827..c6c32f134 100644 --- a/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java +++ b/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java @@ -1,12 +1,12 @@ package net.ess3.storage; -import net.ess3.api.IEssentials; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.logging.Level; +import net.ess3.api.IEssentials; import org.bukkit.Bukkit; diff --git a/Essentials/src/net/ess3/storage/BukkitConstructor.java b/Essentials/src/net/ess3/storage/BukkitConstructor.java index aae975d27..36dc209c1 100644 --- a/Essentials/src/net/ess3/storage/BukkitConstructor.java +++ b/Essentials/src/net/ess3/storage/BukkitConstructor.java @@ -1,12 +1,11 @@ package net.ess3.storage; -import net.ess3.Essentials; import java.lang.reflect.Field; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.regex.Pattern; - +import net.ess3.Essentials; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/net/ess3/storage/IStorageObjectMap.java b/Essentials/src/net/ess3/storage/IStorageObjectMap.java index 5facaf200..c47ece28f 100644 --- a/Essentials/src/net/ess3/storage/IStorageObjectMap.java +++ b/Essentials/src/net/ess3/storage/IStorageObjectMap.java @@ -1,9 +1,9 @@ package net.ess3.storage; -import net.ess3.api.IReload; -import net.ess3.api.InvalidNameException; import java.io.File; import java.util.Set; +import net.ess3.api.IReload; +import net.ess3.api.InvalidNameException; interface IStorageObjectMap<I> extends IReload diff --git a/Essentials/src/net/ess3/storage/ManagedFile.java b/Essentials/src/net/ess3/storage/ManagedFile.java index 216e21f17..ee66f524d 100644 --- a/Essentials/src/net/ess3/storage/ManagedFile.java +++ b/Essentials/src/net/ess3/storage/ManagedFile.java @@ -1,7 +1,5 @@ package net.ess3.storage; -import static net.ess3.I18n._; -import net.ess3.api.IEssentials; import java.io.*; import java.math.BigInteger; import java.security.DigestInputStream; @@ -12,6 +10,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.logging.Level; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; import org.bukkit.Bukkit; diff --git a/Essentials/src/net/ess3/storage/StorageObjectMap.java b/Essentials/src/net/ess3/storage/StorageObjectMap.java index d8bf49d9c..168e59754 100644 --- a/Essentials/src/net/ess3/storage/StorageObjectMap.java +++ b/Essentials/src/net/ess3/storage/StorageObjectMap.java @@ -1,8 +1,5 @@ package net.ess3.storage; -import net.ess3.utils.Util; -import net.ess3.api.IEssentials; -import net.ess3.api.InvalidNameException; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; @@ -15,6 +12,9 @@ import java.util.Set; import java.util.concurrent.ConcurrentSkipListSet; import java.util.concurrent.ExecutionException; import java.util.logging.Level; +import net.ess3.api.IEssentials; +import net.ess3.api.InvalidNameException; +import net.ess3.utils.Util; import org.bukkit.Bukkit; diff --git a/Essentials/src/net/ess3/user/Ban.java b/Essentials/src/net/ess3/user/Ban.java index 3fd5d1192..2938d0b62 100644 --- a/Essentials/src/net/ess3/user/Ban.java +++ b/Essentials/src/net/ess3/user/Ban.java @@ -1,8 +1,8 @@ package net.ess3.user; -import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.StorageObject; @Data diff --git a/Essentials/src/net/ess3/user/Inventory.java b/Essentials/src/net/ess3/user/Inventory.java index 621163e33..b50b8c535 100644 --- a/Essentials/src/net/ess3/user/Inventory.java +++ b/Essentials/src/net/ess3/user/Inventory.java @@ -1,12 +1,12 @@ package net.ess3.user; -import net.ess3.storage.MapKeyType; -import net.ess3.storage.MapValueType; -import net.ess3.storage.StorageObject; import java.util.HashMap; import java.util.Map; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.MapKeyType; +import net.ess3.storage.MapValueType; +import net.ess3.storage.StorageObject; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/net/ess3/user/UserBase.java b/Essentials/src/net/ess3/user/UserBase.java index 18bede37c..5c975119d 100644 --- a/Essentials/src/net/ess3/user/UserBase.java +++ b/Essentials/src/net/ess3/user/UserBase.java @@ -1,6 +1,10 @@ package net.ess3.user; -import net.ess3.utils.Util; +import java.io.File; +import java.io.IOException; +import java.util.*; +import lombok.Cleanup; +import lombok.Delegate; import net.ess3.api.IEssentials; import net.ess3.api.ISettings; import net.ess3.api.IUser; @@ -8,13 +12,7 @@ import net.ess3.api.InvalidNameException; import net.ess3.permissions.Permissions; import net.ess3.storage.AsyncStorageObjectHolder; import net.ess3.storage.Location.WorldNotLoadedException; -import java.io.File; -import java.io.IOException; -import java.util.*; -import java.util.logging.Level; -import java.util.logging.Logger; -import lombok.Cleanup; -import lombok.Delegate; +import net.ess3.utils.Util; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.OfflinePlayer; diff --git a/Essentials/src/net/ess3/user/UserData.java b/Essentials/src/net/ess3/user/UserData.java index 702fecf03..04a8d7879 100644 --- a/Essentials/src/net/ess3/user/UserData.java +++ b/Essentials/src/net/ess3/user/UserData.java @@ -1,9 +1,9 @@ package net.ess3.user; -import net.ess3.storage.*; import java.util.*; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.*; import org.bukkit.Material; diff --git a/Essentials/src/net/ess3/user/UserMap.java b/Essentials/src/net/ess3/user/UserMap.java index a0e6aee44..cc34536b3 100644 --- a/Essentials/src/net/ess3/user/UserMap.java +++ b/Essentials/src/net/ess3/user/UserMap.java @@ -1,13 +1,13 @@ package net.ess3.user; +import java.io.File; +import java.util.Locale; +import java.util.Set; import net.ess3.api.IEssentials; import net.ess3.api.IUser; import net.ess3.api.IUserMap; import net.ess3.api.InvalidNameException; import net.ess3.storage.StorageObjectMap; -import java.io.File; -import java.util.Locale; -import java.util.Set; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/utils/DateUtil.java b/Essentials/src/net/ess3/utils/DateUtil.java index 02916139c..de2be3131 100644 --- a/Essentials/src/net/ess3/utils/DateUtil.java +++ b/Essentials/src/net/ess3/utils/DateUtil.java @@ -1,10 +1,10 @@ package net.ess3.utils; -import static net.ess3.I18n._; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.regex.Matcher; import java.util.regex.Pattern; +import static net.ess3.I18n._; public class DateUtil { public static String formatDateDiff(long date) diff --git a/Essentials/src/net/ess3/utils/DescParseTickFormat.java b/Essentials/src/net/ess3/utils/DescParseTickFormat.java index bf7d95c23..1c93a3575 100644 --- a/Essentials/src/net/ess3/utils/DescParseTickFormat.java +++ b/Essentials/src/net/ess3/utils/DescParseTickFormat.java @@ -1,8 +1,8 @@ package net.ess3.utils; -import static net.ess3.I18n._; import java.text.SimpleDateFormat; import java.util.*; +import static net.ess3.I18n._; /** diff --git a/Essentials/src/net/ess3/utils/LocationUtil.java b/Essentials/src/net/ess3/utils/LocationUtil.java index 61cdcec6e..ecde8b8b7 100644 --- a/Essentials/src/net/ess3/utils/LocationUtil.java +++ b/Essentials/src/net/ess3/utils/LocationUtil.java @@ -1,8 +1,8 @@ package net.ess3.utils; -import static net.ess3.I18n._; import java.util.HashSet; import java.util.Set; +import static net.ess3.I18n._; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; diff --git a/Essentials/src/net/ess3/utils/Util.java b/Essentials/src/net/ess3/utils/Util.java index 8121f8ff8..273cd4679 100644 --- a/Essentials/src/net/ess3/utils/Util.java +++ b/Essentials/src/net/ess3/utils/Util.java @@ -1,12 +1,5 @@ package net.ess3.utils; -import static net.ess3.I18n._; -import net.ess3.api.IEssentials; -import net.ess3.api.ISettings; -import net.ess3.api.IUser; -import net.ess3.api.InvalidNameException; -import net.ess3.utils.gnu.inet.encoding.Punycode; -import net.ess3.utils.gnu.inet.encoding.PunycodeException; import de.bananaco.bpermissions.imp.Permissions; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; @@ -14,6 +7,13 @@ import java.util.Collection; import java.util.Locale; import java.util.regex.Pattern; import lombok.Cleanup; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.api.InvalidNameException; +import net.ess3.utils.gnu.inet.encoding.Punycode; +import net.ess3.utils.gnu.inet.encoding.PunycodeException; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/Essentials/src/net/ess3/utils/textreader/HelpInput.java b/Essentials/src/net/ess3/utils/textreader/HelpInput.java index 109cc3702..38f6306ac 100644 --- a/Essentials/src/net/ess3/utils/textreader/HelpInput.java +++ b/Essentials/src/net/ess3/utils/textreader/HelpInput.java @@ -1,15 +1,15 @@ package net.ess3.utils.textreader; -import static net.ess3.I18n._; -import net.ess3.api.IEssentials; -import net.ess3.api.ISettings; -import net.ess3.api.IUser; -import net.ess3.permissions.HelpPermissions; import java.io.IOException; import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; import lombok.Cleanup; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.permissions.HelpPermissions; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginDescriptionFile; diff --git a/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java b/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java index 3ec331d7a..a3d7ef322 100644 --- a/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java +++ b/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java @@ -1,14 +1,14 @@ package net.ess3.utils.textreader; -import net.ess3.utils.DescParseTickFormat; -import net.ess3.api.IEssentials; -import net.ess3.api.IUser; import java.text.DateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; import lombok.Cleanup; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.utils.DescParseTickFormat; import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -43,8 +43,8 @@ public class KeywordReplacer implements IText user.setDisplayNick(); displayName = user.getDisplayName(); userName = user.getName(); - ipAddress = user.getAddress().getAddress().toString(); - address = user.getAddress().toString(); + ipAddress = user.getAddress() == null || user.getAddress().getAddress() == null ? "" : user.getAddress().getAddress().toString(); + address = user.getAddress() == null ? "" : user.getAddress().toString(); balance = Double.toString(user.getMoney()); mails = Integer.toString(user.getData().getMails() == null ? 0 : user.getData().getMails().size()); world = user.getLocation() == null || user.getLocation().getWorld() == null ? "" : user.getLocation().getWorld().getName(); diff --git a/Essentials/src/net/ess3/utils/textreader/TextInput.java b/Essentials/src/net/ess3/utils/textreader/TextInput.java index 20fecc255..6cb251e93 100644 --- a/Essentials/src/net/ess3/utils/textreader/TextInput.java +++ b/Essentials/src/net/ess3/utils/textreader/TextInput.java @@ -1,13 +1,13 @@ package net.ess3.utils.textreader; -import net.ess3.utils.Util; -import net.ess3.api.IEssentials; -import net.ess3.api.IUser; -import net.ess3.api.InvalidNameException; import java.io.*; import java.lang.ref.SoftReference; import java.util.*; import java.util.logging.Level; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.api.InvalidNameException; +import net.ess3.utils.Util; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/utils/textreader/TextPager.java b/Essentials/src/net/ess3/utils/textreader/TextPager.java index 18b662be5..88f00125c 100644 --- a/Essentials/src/net/ess3/utils/textreader/TextPager.java +++ b/Essentials/src/net/ess3/utils/textreader/TextPager.java @@ -1,11 +1,10 @@ package net.ess3.utils.textreader; -import net.ess3.I18n; -import static net.ess3.I18n._; import java.util.List; import java.util.Locale; import java.util.Map; - +import net.ess3.I18n; +import static net.ess3.I18n._; import org.bukkit.command.CommandSender; diff --git a/Essentials/test/net/ess3/EconomyTest.java b/Essentials/test/net/ess3/EconomyTest.java index 978f35fc6..e6cb6bde5 100644 --- a/Essentials/test/net/ess3/EconomyTest.java +++ b/Essentials/test/net/ess3/EconomyTest.java @@ -1,10 +1,10 @@ package net.ess3; +import java.io.IOException; +import junit.framework.TestCase; import net.ess3.api.NoLoanPermittedException; import net.ess3.api.UserDoesNotExistException; import net.ess3.user.User; -import java.io.IOException; -import junit.framework.TestCase; import org.bukkit.World.Environment; import org.bukkit.plugin.InvalidDescriptionException; import org.junit.Test; diff --git a/Essentials/test/net/ess3/FakeServer.java b/Essentials/test/net/ess3/FakeServer.java index 86f5329fe..aeed3e4b8 100644 --- a/Essentials/test/net/ess3/FakeServer.java +++ b/Essentials/test/net/ess3/FakeServer.java @@ -6,8 +6,8 @@ import java.util.*; import java.util.concurrent.Callable; import java.util.concurrent.Future; import java.util.logging.Logger; -import org.bukkit.*; import org.bukkit.World.Environment; +import org.bukkit.*; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.PluginCommand; diff --git a/Essentials/test/net/ess3/StorageTest.java b/Essentials/test/net/ess3/StorageTest.java index 429844e76..ea37e123b 100644 --- a/Essentials/test/net/ess3/StorageTest.java +++ b/Essentials/test/net/ess3/StorageTest.java @@ -1,13 +1,13 @@ package net.ess3; -import net.ess3.utils.ExecuteTimer; +import java.io.*; +import junit.framework.TestCase; import net.ess3.settings.Settings; import net.ess3.storage.ObjectLoadException; import net.ess3.storage.StorageObject; import net.ess3.storage.YamlStorageReader; import net.ess3.storage.YamlStorageWriter; -import java.io.*; -import junit.framework.TestCase; +import net.ess3.utils.ExecuteTimer; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.World.Environment; diff --git a/Essentials/test/net/ess3/UserTest.java b/Essentials/test/net/ess3/UserTest.java index e834e0175..ec05174d3 100644 --- a/Essentials/test/net/ess3/UserTest.java +++ b/Essentials/test/net/ess3/UserTest.java @@ -1,9 +1,9 @@ package net.ess3; -import net.ess3.api.IUser; -import net.ess3.user.User; import java.io.IOException; import junit.framework.TestCase; +import net.ess3.api.IUser; +import net.ess3.user.User; import org.bukkit.World.Environment; import org.bukkit.plugin.InvalidDescriptionException; diff --git a/Essentials/test/net/ess3/UtilTest.java b/Essentials/test/net/ess3/UtilTest.java index 6ab863fc2..131828d46 100644 --- a/Essentials/test/net/ess3/UtilTest.java +++ b/Essentials/test/net/ess3/UtilTest.java @@ -1,14 +1,14 @@ package net.ess3; -import net.ess3.api.InvalidNameException; -import net.ess3.utils.DateUtil; -import net.ess3.utils.Util; import java.io.IOException; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.logging.Level; import java.util.logging.Logger; import junit.framework.TestCase; +import net.ess3.api.InvalidNameException; +import net.ess3.utils.DateUtil; +import net.ess3.utils.Util; import org.bukkit.World.Environment; import org.bukkit.plugin.InvalidDescriptionException; diff --git a/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java index a6bbeffec..14554e3a9 100644 --- a/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java +++ b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java @@ -53,7 +53,11 @@ public class EssentialsGeoIPPlayerListener implements Listener, IReload config.acquireReadLock(); try { + if (event.getPlayer().getAddress() == null || event.getPlayer().getAddress().getAddress() == null) { + return; + } final InetAddress address = event.getPlayer().getAddress().getAddress(); + final StringBuilder builder = new StringBuilder(); if (config.getData().getDatabase().isShowCities()) { diff --git a/README.markdown b/README.markdown index 1913e1ba1..a3c2c1d42 100644 --- a/README.markdown +++ b/README.markdown @@ -1,9 +1,11 @@ -Essentials Development Readme +Essentials Development Readme - 3.0 ============================= The official repository is at: https://github.com/essentials/Essentials +The master repository is not for production use. Use branch 2.9 for production use code. + We use NetBeans 7 for development. Recommended NetBeans plugins: |