Fix some legacy style code/comments

DenizenScript · Jan 28, 2020 · 943e41d · 943e41d
1 parent 72e0b72
commit 943e41d
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 19 deletions.
diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/commands/bossshop/BossShopCommand.java b/src/main/java/com/denizenscript/depenizen/bukkit/commands/bossshop/BossShopCommand.java
@@ -78,7 +78,6 @@ public void execute(ScriptEntry scriptEntry) {
         PlayerTag target = scriptEntry.getObjectTag("target");
         ElementTag dshop = scriptEntry.getObjectTag("shop");
 
-        // Report to dB
         Debug.report(scriptEntry, getName(),
                 (target != null ? target.debug() : "")
                         + (dshop != null ? dshop.debug() : ""));

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/commands/effectlib/EffectLibCommand.java b/src/main/java/com/denizenscript/depenizen/bukkit/commands/effectlib/EffectLibCommand.java
@@ -107,7 +107,6 @@ public void execute(final ScriptEntry scriptEntry) {
         DurationTag duration = (DurationTag) scriptEntry.getObject("duration");
         LocationTag location = (LocationTag) scriptEntry.getObject("location");
 
-        // Report to dB
         Debug.report(scriptEntry, getName(), (target != null ? target.debug() : "")
                 + (action != null ? action.toString() : "")
                 + (duration != null ? duration.debug() : "")

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/commands/jobs/JobsCommand.java b/src/main/java/com/denizenscript/depenizen/bukkit/commands/jobs/JobsCommand.java
@@ -3,7 +3,6 @@
 import com.denizenscript.denizencore.objects.Argument;
 import com.gamingmesh.jobs.Jobs;
 import com.gamingmesh.jobs.container.JobsPlayer;
-import com.denizenscript.denizen.utilities.implementation.BukkitScriptEntryData;
 import com.denizenscript.denizen.utilities.Utilities;
 import com.denizenscript.denizencore.exceptions.InvalidArgumentsException;
 import com.denizenscript.denizencore.objects.core.ElementTag;
@@ -38,8 +37,8 @@ public class JobsCommand extends AbstractCommand {
     // - jobs demote Builder 3
     //
     // @Usage
-    // Use to make a player join a job.
-    // - jobs join Worker player:Jeebiss
+    // Use to make a different player join a job.
+    // - jobs join Worker player:<[player]>
     //
     // -->
 
@@ -87,12 +86,10 @@ else if (!scriptEntry.hasObject("number")
     @Override
     public void execute(ScriptEntry scriptEntry) {
 
-        BukkitScriptEntryData scriptEntryData = (BukkitScriptEntryData) scriptEntry.entryData;
-
         Action action = (Action) scriptEntry.getObject("action");
         JobsJobTag job = (JobsJobTag) scriptEntry.getObject("job");
         int number = (scriptEntry.hasObject("number") ? scriptEntry.getElement("number").asInt() : 0);
-        JobsPlayer player = Jobs.getPlayerManager().getJobsPlayer(scriptEntryData.getPlayer().getName());
+        JobsPlayer player = Jobs.getPlayerManager().getJobsPlayer(Utilities.getEntryPlayer(scriptEntry).getName());
 
         switch (action) {
 

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/commands/libsdisguises/DisguiseCommand.java b/src/main/java/com/denizenscript/depenizen/bukkit/commands/libsdisguises/DisguiseCommand.java
@@ -169,7 +169,6 @@ public void execute(ScriptEntry scriptEntry) {
         ElementTag baby = scriptEntry.getObjectTag("baby");
         ElementTag self = scriptEntry.getObjectTag("self");
 
-        // Report to dB
         Debug.report(scriptEntry, getName(), action.debug()
                 + (target != null ? target.debug() : "")
                 + (type != null ? type.debug() : "")

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/commands/mcmmo/McMMOCommand.java b/src/main/java/com/denizenscript/depenizen/bukkit/commands/mcmmo/McMMOCommand.java
@@ -1,5 +1,6 @@
 package com.denizenscript.depenizen.bukkit.commands.mcmmo;
 
+import com.denizenscript.denizen.utilities.Utilities;
 import com.denizenscript.denizencore.objects.Argument;
 import com.gmail.nossr50.api.ExperienceAPI;
 import com.gmail.nossr50.api.PartyAPI;
@@ -8,7 +9,6 @@
 import com.gmail.nossr50.database.DatabaseManagerFactory;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.party.PartyManager;
-import com.denizenscript.denizen.utilities.implementation.BukkitScriptEntryData;
 import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizen.utilities.debugging.Debug;
 import com.denizenscript.denizencore.exceptions.InvalidArgumentsException;
@@ -40,8 +40,8 @@ public class McMMOCommand extends AbstractCommand {
     // - mcmmo add levels skill:acrobatics quantity:5
     //
     // @Usage
-    // Use to remove a player from a party.
-    // - mcmmo remove player:SerpentX party:SerpentPeople
+    // Use to remove a different player from a party.
+    // - mcmmo remove player:<[player]> party:SerpentPeople
     //
     // @Usage
     // Use to set vampirism mode for a player's skill.
@@ -118,19 +118,15 @@ else if (!scriptEntry.hasObject("type")
     @Override
     public void execute(ScriptEntry scriptEntry) {
 
-        BukkitScriptEntryData scriptEntryData = (BukkitScriptEntryData) scriptEntry.entryData;
-
-        // Get objects
         ElementTag action = scriptEntry.getElement("action");
         ElementTag state = scriptEntry.getElement("state");
         ElementTag type = scriptEntry.getElement("type");
         ElementTag quantity = scriptEntry.getElement("quantity");
         ElementTag party = scriptEntry.getElement("party");
         ElementTag skill = scriptEntry.getElement("skill");
 
-        PlayerTag player = scriptEntryData.getPlayer();
+        PlayerTag player = Utilities.getEntryPlayer(scriptEntry);
 
-        // Report to dB
         Debug.report(scriptEntry, getName(), action.debug() + type.debug() + (state != null ? state.debug() : "") + quantity.debug()
                 + (party != null ? party.debug() : "") + (skill != null ? skill.debug() : ""));
 

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/commands/noteblockapi/NBSCommand.java b/src/main/java/com/denizenscript/depenizen/bukkit/commands/noteblockapi/NBSCommand.java
@@ -107,7 +107,6 @@ public void execute(ScriptEntry scriptEntry) {
         ElementTag action = scriptEntry.getObjectTag("action");
         List<PlayerTag> targets = (List<PlayerTag>) scriptEntry.getObject("targets");
 
-        // Report to dB
         Debug.report(scriptEntry, getName(), action.debug()
                 + ArgumentHelper.debugList("targets", targets)
                 + (file != null ? file.debug() : ""));

diff --git a/...in/java/com/denizenscript/depenizen/bukkit/commands/playerpoints/PlayerPointsCommand.java b/...in/java/com/denizenscript/depenizen/bukkit/commands/playerpoints/PlayerPointsCommand.java
@@ -93,7 +93,6 @@ public void execute(ScriptEntry scriptEntry) {
         ElementTag action = scriptEntry.getObjectTag("action");
         ElementTag amount = scriptEntry.getObjectTag("amount");
 
-        // Report to dB
         Debug.report(scriptEntry, getName(), action.debug()
                 + (target != null ? target.debug() : "")
                 + (amount != null ? amount.debug() : ""));