From af25281ef22045c17e86837da1ccbe04e21a7cbc Mon Sep 17 00:00:00 2001 From: Ken B Date: Thu, 9 Aug 2018 00:38:56 -0400 Subject: [PATCH 1/6] Fix job editor chat event --- pom.xml | 8 ++++---- .../com/gamingmesh/jobs/listeners/JobsListener.java | 13 +++++++++---- src/main/resources/plugin.yml | 2 +- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 134ac2c2..8fe1b8a5 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 Jobs jobs - 4.5.1 + 4.6.3 Jobs http://maven.apache.org @@ -16,7 +16,7 @@ org.spigotmc spigot-api - 1.12-R0.1-SNAPSHOT + 1.13-R0.1-SNAPSHOT provided @@ -125,14 +125,14 @@ 1.7 - + diff --git a/src/main/java/com/gamingmesh/jobs/listeners/JobsListener.java b/src/main/java/com/gamingmesh/jobs/listeners/JobsListener.java index aa509f4b..9e96a52e 100644 --- a/src/main/java/com/gamingmesh/jobs/listeners/JobsListener.java +++ b/src/main/java/com/gamingmesh/jobs/listeners/JobsListener.java @@ -95,23 +95,28 @@ public class JobsListener implements Listener { } @EventHandler(priority = EventPriority.NORMAL) - public void AsyncPlayerChatEvent(AsyncPlayerChatEvent event) { + public void AsyncPlayerChatEvent(final AsyncPlayerChatEvent event) { if (event.isCancelled()) return; if (Util.getJobsEditorMap().isEmpty()) return; - Player player = event.getPlayer(); + final Player player = event.getPlayer(); if (!Util.getJobsEditorMap().containsKey(player.getUniqueId())) return; - String msg = Util.getJobsEditorMap().remove(player.getUniqueId()); + final String msg = Util.getJobsEditorMap().remove(player.getUniqueId()); if (msg == null) return; - player.performCommand(msg + event.getMessage()); + Bukkit.getServer().getScheduler().runTask(plugin, new Runnable() { + @Override + public void run() { + player.performCommand(msg + event.getMessage()); + } + }); event.setCancelled(true); } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index fea6214b..15d4ac84 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ name: Jobs description: Jobs Plugin for the BukkitAPI main: com.gamingmesh.jobs.Jobs -version: 4.6.1 +version: 4.6.3 api-version: 1.13 website: https://www.spigotmc.org/resources/jobs-reborn.4216/ author: phrstbrn From 14a26e927ef5664269dc0ffee5c974b6b4472d03 Mon Sep 17 00:00:00 2001 From: montlikadani Date: Fri, 10 Aug 2018 19:49:29 +0200 Subject: [PATCH 2/6] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8fe1b8a5..ca7a68f9 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 Jobs jobs - 4.6.3 + 4.7.1 Jobs http://maven.apache.org From f7b3efb491a8cc54b489c8f2be70012f8a5d69fc Mon Sep 17 00:00:00 2001 From: montlikadani Date: Fri, 10 Aug 2018 19:49:41 +0200 Subject: [PATCH 3/6] Update plugin.yml --- src/main/resources/plugin.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 15d4ac84..5535f903 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ name: Jobs description: Jobs Plugin for the BukkitAPI main: com.gamingmesh.jobs.Jobs -version: 4.6.3 +version: 4.7.1 api-version: 1.13 website: https://www.spigotmc.org/resources/jobs-reborn.4216/ author: phrstbrn @@ -190,4 +190,4 @@ permissions: default: true jobs.command.edititembonus: description: Grants access to the edititembonus command - default: op \ No newline at end of file + default: op From c0999ec3691b827aa42146ffec21ef8a2e2f8ece Mon Sep 17 00:00:00 2001 From: montlikadani Date: Mon, 20 Aug 2018 13:09:58 +0200 Subject: [PATCH 4/6] Update plugin.yml From 861b2bee81e944d521b35d03ecece1930b7de146 Mon Sep 17 00:00:00 2001 From: montlikadani Date: Mon, 20 Aug 2018 13:10:29 +0200 Subject: [PATCH 5/6] Delete plugin.yml --- src/main/resources/plugin.yml | 193 ---------------------------------- 1 file changed, 193 deletions(-) delete mode 100644 src/main/resources/plugin.yml diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml deleted file mode 100644 index 8cf95448..00000000 --- a/src/main/resources/plugin.yml +++ /dev/null @@ -1,193 +0,0 @@ -name: Jobs -description: Jobs Plugin for the BukkitAPI -main: com.gamingmesh.jobs.Jobs -version: 4.7.2 -api-version: 1.13 -website: https://www.spigotmc.org/resources/jobs-reborn.4216/ -author: phrstbrn -softdepend: [Vault, iConomy, MythicMobs, McMMO, WorldGuard, MyPet] -commands: - jobs: - description: Jobs - usage: /jobs -permissions: - jobs.*: - description: Grants access to all Jobs commands - children: - jobs.admin: true - jobs.autojoin.*: - default: false - jobs.admin: - description: Grants permissions as an admin - default: false - children: - jobs.use: true - jobs.command.*: true - jobs.use: - description: Grants ability to use this plugin - default: true - jobs.command.*: - description: Grants player access to all commands - default: false - children: - jobs.command.browse: true - jobs.command.stats: true - jobs.command.admin.stats: true - jobs.command.admin.archive: true - jobs.command.archive: true - jobs.command.join: true - jobs.command.leave: true - jobs.command.leaveall: true - jobs.command.info: true - jobs.command.playerinfo: true - jobs.command.fire: true - jobs.command.fireall: true - jobs.command.employ: true - jobs.command.promote: true - jobs.command.demote: true - jobs.command.grantxp: true - jobs.command.removexp: true - jobs.command.transfer: true - jobs.command.reload: true - jobs.command.help: true - jobs.command.top: true - jobs.command.gtop: true - jobs.command.toggle: true - jobs.command.limit: true - jobs.command.give: true - jobs.command.signs: true - jobs.command.fixnames: true - jobs.command.signupdate: true - jobs.command.moneyboost: true - jobs.command.expboost: true - jobs.command.iteminfo: true - jobs.command.blockinfo: true - jobs.command.browse: - description: Grants access to the browse command - default: true - jobs.command.top: - description: Grants access to the top command - default: true - jobs.command.gtop: - description: Grants access to the gtop command - default: true - jobs.command.stats: - description: Grants access to the stats command - default: true - jobs.command.archive: - description: Grants access to the archive command - default: true - jobs.command.admin.archive: - description: Grants access to the archive command on other players - default: true - jobs.command.admin.stats: - description: Grants access to the stats command on other players - default: true - jobs.command.join: - description: Grants access to the join command - default: true - jobs.command.leave: - description: Grants access to the leave command - default: true - jobs.command.leaveall: - description: Grants access to the leaveall command - default: true - jobs.command.info: - description: Grants access to the info command - default: true - jobs.command.playerinfo: - description: Grants access to the playerinfo command - default: op - jobs.command.fire: - description: Grants access to the fire command - default: op - jobs.command.fireall: - description: Grants access to the fireall command - default: op - jobs.command.employ: - description: Grants access to the employ command - default: op - jobs.command.promote: - description: Grants access to the promote command - default: op - jobs.command.demote: - description: Grants access to the demote command - default: op - jobs.command.grantxp: - description: Grants access to the grantxp command - default: op - jobs.command.removexp: - description: Grants access to the removexp command - default: op - jobs.command.transfer: - description: Grants access to the transfer command - default: op - jobs.command.reload: - description: Grants access to the reload command - default: op - jobs.command.signupdate: - description: Grants access to the reload command - default: op - jobs.command.give: - description: Grants access to the give command - default: op - jobs.command.expboost: - description: Grants access to the expboost command - default: op - jobs.command.moneyboost: - description: Grants access to the moneyboost command - default: op - jobs.command.help: - description: Grants access to the help command - default: true - jobs.command.toggle: - description: Grants access to the toggle command - default: true - jobs.command.limit: - description: Grants access to the limit command - default: true - jobs.command.fixnames: - description: Grants access to the fixnames command - default: true - jobs.command.log: - description: Grants access to the log command - default: true - jobs.command.shop: - description: Grants access to the shop command - default: true - jobs.command.points: - description: Grants access to the points command - default: true - jobs.command.log.others: - description: Grants access to the log command - default: op - jobs.command.glog: - description: Grants access to the glog command - default: op - jobs.command.bonus: - description: Grants access to the bonus command - default: true - jobs.command.points: - description: Grants access to the points command - default: true - jobs.command.blockinfo: - description: Grants access to the blockinfo command - default: true - jobs.command.iteminfo: - description: Grants access to the iteminfo command - default: true - jobs.command.exp: - description: Grants access to the exp command - default: op - jobs.command.quests: - description: Grants access to the quests command - default: true - jobs.command.clearownership: - description: Grants access to the clearownership command - default: true - jobs.command.itembonus: - description: Grants access to the itembonus command - default: true - jobs.command.edititembonus: - description: Grants access to the edititembonus command - default: op From 8c6cd42b8a7a8ef2a7f2a40ba1f789b2b2c0c026 Mon Sep 17 00:00:00 2001 From: montlikadani Date: Mon, 20 Aug 2018 13:18:04 +0200 Subject: [PATCH 6/6] Revert "Delete plugin.yml" This reverts commit 861b2bee81e944d521b35d03ecece1930b7de146. --- src/main/resources/plugin.yml | 193 ++++++++++++++++++++++++++++++++++ 1 file changed, 193 insertions(+) create mode 100644 src/main/resources/plugin.yml diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml new file mode 100644 index 00000000..8cf95448 --- /dev/null +++ b/src/main/resources/plugin.yml @@ -0,0 +1,193 @@ +name: Jobs +description: Jobs Plugin for the BukkitAPI +main: com.gamingmesh.jobs.Jobs +version: 4.7.2 +api-version: 1.13 +website: https://www.spigotmc.org/resources/jobs-reborn.4216/ +author: phrstbrn +softdepend: [Vault, iConomy, MythicMobs, McMMO, WorldGuard, MyPet] +commands: + jobs: + description: Jobs + usage: /jobs +permissions: + jobs.*: + description: Grants access to all Jobs commands + children: + jobs.admin: true + jobs.autojoin.*: + default: false + jobs.admin: + description: Grants permissions as an admin + default: false + children: + jobs.use: true + jobs.command.*: true + jobs.use: + description: Grants ability to use this plugin + default: true + jobs.command.*: + description: Grants player access to all commands + default: false + children: + jobs.command.browse: true + jobs.command.stats: true + jobs.command.admin.stats: true + jobs.command.admin.archive: true + jobs.command.archive: true + jobs.command.join: true + jobs.command.leave: true + jobs.command.leaveall: true + jobs.command.info: true + jobs.command.playerinfo: true + jobs.command.fire: true + jobs.command.fireall: true + jobs.command.employ: true + jobs.command.promote: true + jobs.command.demote: true + jobs.command.grantxp: true + jobs.command.removexp: true + jobs.command.transfer: true + jobs.command.reload: true + jobs.command.help: true + jobs.command.top: true + jobs.command.gtop: true + jobs.command.toggle: true + jobs.command.limit: true + jobs.command.give: true + jobs.command.signs: true + jobs.command.fixnames: true + jobs.command.signupdate: true + jobs.command.moneyboost: true + jobs.command.expboost: true + jobs.command.iteminfo: true + jobs.command.blockinfo: true + jobs.command.browse: + description: Grants access to the browse command + default: true + jobs.command.top: + description: Grants access to the top command + default: true + jobs.command.gtop: + description: Grants access to the gtop command + default: true + jobs.command.stats: + description: Grants access to the stats command + default: true + jobs.command.archive: + description: Grants access to the archive command + default: true + jobs.command.admin.archive: + description: Grants access to the archive command on other players + default: true + jobs.command.admin.stats: + description: Grants access to the stats command on other players + default: true + jobs.command.join: + description: Grants access to the join command + default: true + jobs.command.leave: + description: Grants access to the leave command + default: true + jobs.command.leaveall: + description: Grants access to the leaveall command + default: true + jobs.command.info: + description: Grants access to the info command + default: true + jobs.command.playerinfo: + description: Grants access to the playerinfo command + default: op + jobs.command.fire: + description: Grants access to the fire command + default: op + jobs.command.fireall: + description: Grants access to the fireall command + default: op + jobs.command.employ: + description: Grants access to the employ command + default: op + jobs.command.promote: + description: Grants access to the promote command + default: op + jobs.command.demote: + description: Grants access to the demote command + default: op + jobs.command.grantxp: + description: Grants access to the grantxp command + default: op + jobs.command.removexp: + description: Grants access to the removexp command + default: op + jobs.command.transfer: + description: Grants access to the transfer command + default: op + jobs.command.reload: + description: Grants access to the reload command + default: op + jobs.command.signupdate: + description: Grants access to the reload command + default: op + jobs.command.give: + description: Grants access to the give command + default: op + jobs.command.expboost: + description: Grants access to the expboost command + default: op + jobs.command.moneyboost: + description: Grants access to the moneyboost command + default: op + jobs.command.help: + description: Grants access to the help command + default: true + jobs.command.toggle: + description: Grants access to the toggle command + default: true + jobs.command.limit: + description: Grants access to the limit command + default: true + jobs.command.fixnames: + description: Grants access to the fixnames command + default: true + jobs.command.log: + description: Grants access to the log command + default: true + jobs.command.shop: + description: Grants access to the shop command + default: true + jobs.command.points: + description: Grants access to the points command + default: true + jobs.command.log.others: + description: Grants access to the log command + default: op + jobs.command.glog: + description: Grants access to the glog command + default: op + jobs.command.bonus: + description: Grants access to the bonus command + default: true + jobs.command.points: + description: Grants access to the points command + default: true + jobs.command.blockinfo: + description: Grants access to the blockinfo command + default: true + jobs.command.iteminfo: + description: Grants access to the iteminfo command + default: true + jobs.command.exp: + description: Grants access to the exp command + default: op + jobs.command.quests: + description: Grants access to the quests command + default: true + jobs.command.clearownership: + description: Grants access to the clearownership command + default: true + jobs.command.itembonus: + description: Grants access to the itembonus command + default: true + jobs.command.edititembonus: + description: Grants access to the edititembonus command + default: op