mirror of
https://github.com/Zrips/Jobs.git
synced 2024-11-25 20:16:13 +01:00
Moved configs
- Removed iConomy remnants - Fixed config saving problems
This commit is contained in:
parent
643b9dc842
commit
0a3df3d434
25
pom.xml
25
pom.xml
@ -19,14 +19,6 @@
|
||||
<version>1.13.1-R0.1-SNAPSHOT</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<!-- iConomy7 -->
|
||||
<dependency>
|
||||
<groupId>com.iCo6</groupId>
|
||||
<artifactId>iConomy7</artifactId>
|
||||
<version>7.0.6</version>
|
||||
<scope>system</scope>
|
||||
<systemPath>${basedir}/libs/iConomy7.0.6.jar</systemPath>
|
||||
</dependency>
|
||||
<!-- MyPet -->
|
||||
<dependency>
|
||||
<groupId>de.Keyle.MyPet</groupId>
|
||||
@ -44,23 +36,6 @@
|
||||
<systemPath>${basedir}/libs/mcMMO-1.5.05-SNAPSHOT.jar</systemPath>
|
||||
</dependency>
|
||||
<!-- Vault -->
|
||||
<dependency>
|
||||
<groupId>net.milkbowl.vault</groupId>
|
||||
<artifactId>Vault</artifactId>
|
||||
<version>1.6.6</version>
|
||||
<scope>provided</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.bukkit</groupId>
|
||||
<artifactId>bukkit</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.bukkit</groupId>
|
||||
<artifactId>craftbukkit</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<!-- Dev. Vault -->
|
||||
<dependency>
|
||||
<groupId>net.milkbowl.vault</groupId>
|
||||
<artifactId>Vault</artifactId>
|
||||
|
@ -1 +0,0 @@
|
||||
Signs: {}
|
@ -541,11 +541,12 @@ public class PlayerManager {
|
||||
try {
|
||||
if (Jobs.getGCManager().SoundLevelupUse) {
|
||||
Sound sound = levelUpEvent.getSound();
|
||||
if (sound != null && player != null && player.getLocation() != null)
|
||||
player.getWorld().playSound(player.getLocation(), sound, levelUpEvent.getSoundVolume(), levelUpEvent.getSoundPitch());
|
||||
else
|
||||
if (sound != null) {
|
||||
if (player != null && player.getLocation() != null)
|
||||
player.getWorld().playSound(player.getLocation(), sound, levelUpEvent.getSoundVolume(), levelUpEvent.getSoundPitch());
|
||||
} else
|
||||
Bukkit.getConsoleSender().sendMessage("[Jobs] Can't find sound by name: " + levelUpEvent.getTitleChangeSound().name() + ". Please update it");
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
}
|
||||
|
||||
@ -584,11 +585,12 @@ public class PlayerManager {
|
||||
try {
|
||||
if (Jobs.getGCManager().SoundTitleChangeUse) {
|
||||
Sound sound = levelUpEvent.getTitleChangeSound();
|
||||
if (sound != null && player != null && player.getLocation() != null)
|
||||
player.getWorld().playSound(player.getLocation(), sound, levelUpEvent.getTitleChangeVolume(),
|
||||
levelUpEvent.getTitleChangePitch());
|
||||
else
|
||||
Bukkit.getConsoleSender().sendMessage("[Jobs] Can't find sound by name: " + levelUpEvent.getTitleChangeSound().name() + ". Please update it");
|
||||
if (sound != null) {
|
||||
if (player != null && player.getLocation() != null)
|
||||
player.getWorld().playSound(player.getLocation(), sound, levelUpEvent.getTitleChangeVolume(),
|
||||
levelUpEvent.getTitleChangePitch());
|
||||
} else
|
||||
Bukkit.getConsoleSender().sendMessage("[Jobs] Can't find sound by name: " + levelUpEvent.getTitleChangeSound().name() + ". Please update it");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
}
|
||||
|
@ -433,11 +433,11 @@ public class GeneralConfigManager {
|
||||
|
||||
c.getW().addComment("save-period", "How often in minutes you want it to save. This must be a non-zero number");
|
||||
c.get("save-period", 10);
|
||||
if (c.getC().getInt("save-period") <= 0) {
|
||||
if (c.getW().getInt("save-period") <= 0) {
|
||||
Jobs.getPluginLogger().severe("Save period must be greater than 0! Defaulting to 10 minutes!");
|
||||
c.getC().set("save-period", 10);
|
||||
c.getW().set("save-period", 10);
|
||||
}
|
||||
savePeriod = c.getC().getInt("save-period");
|
||||
savePeriod = c.getW().getInt("save-period");
|
||||
|
||||
c.getW().addComment("save-on-disconnect", "Should player data be saved on disconnect?",
|
||||
"Player data is always periodically auto-saved and autosaved during a clean shutdown.",
|
||||
@ -843,9 +843,12 @@ public class GeneralConfigManager {
|
||||
c.getW().addComment("BossBar.Enabled", "Enables BossBar feature", "Works only from 1.9 mc version");
|
||||
BossBarEnabled = c.get("BossBar.Enabled", true);
|
||||
|
||||
if (BossBarEnabled == true && Jobs.getVersionCheckManager().getVersion().isLower(Version.v1_9_R1)) {
|
||||
BossBarEnabled = false;
|
||||
Jobs.consoleMsg("&c[Jobs] Your server version don't support BossBar. This feature will be disabled");
|
||||
if (BossBarEnabled == true) {
|
||||
if (Jobs.getVersionCheckManager().getVersion().isLower(Version.v1_9_R1)) {
|
||||
Jobs.consoleMsg("&c[Jobs] Your server version don't support BossBar. This feature will be disabled.");
|
||||
c.getW().set("BossBar.Enabled", false);
|
||||
BossBarEnabled = false;
|
||||
}
|
||||
}
|
||||
|
||||
c.getW().addComment("BossBar.Messages.EnabledByDefault", "When this set to true player will see Bossbar messages by default");
|
||||
|
@ -119,13 +119,11 @@ public class JobsPaymentListener implements Listener {
|
||||
|
||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||
public void villagerTradeInventoryClick(InventoryClickEvent event) {
|
||||
|
||||
//disabling plugin in world
|
||||
if (event.getWhoClicked() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getWhoClicked().getWorld()))
|
||||
return;
|
||||
|
||||
// make sure plugin is enabled
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
//disabling plugin in world
|
||||
if (event.getWhoClicked() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getWhoClicked().getWorld()))
|
||||
return;
|
||||
|
||||
if (event.isCancelled())
|
||||
@ -207,12 +205,11 @@ public class JobsPaymentListener implements Listener {
|
||||
|
||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||
public void onCowMilking(PlayerInteractEntityEvent event) {
|
||||
//disabling plugin in world
|
||||
if (event.getPlayer() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getPlayer().getWorld()))
|
||||
return;
|
||||
|
||||
// make sure plugin is enabled
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
//disabling plugin in world
|
||||
if (event.getPlayer() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getPlayer().getWorld()))
|
||||
return;
|
||||
|
||||
if (!(event.getRightClicked() instanceof LivingEntity))
|
||||
@ -270,6 +267,9 @@ public class JobsPaymentListener implements Listener {
|
||||
|
||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||
public void onEntityShear(PlayerShearEntityEvent event) {
|
||||
// make sure plugin is enabled
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
//disabling plugin in world
|
||||
if (event.getPlayer() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getPlayer().getWorld()))
|
||||
return;
|
||||
@ -284,10 +284,6 @@ public class JobsPaymentListener implements Listener {
|
||||
return;
|
||||
}
|
||||
|
||||
// make sure plugin is enabled
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
|
||||
Player player = event.getPlayer();
|
||||
|
||||
if (player == null)
|
||||
@ -310,11 +306,11 @@ public class JobsPaymentListener implements Listener {
|
||||
|
||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||
public void onBrewEvent(BrewEvent event) {
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
//disabling plugin in world
|
||||
if (event.getBlock() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getBlock().getWorld()))
|
||||
return;
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
Block block = event.getBlock();
|
||||
if (block == null)
|
||||
return;
|
||||
@ -353,6 +349,9 @@ public class JobsPaymentListener implements Listener {
|
||||
|
||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||
public void onBlockBreak(BlockBreakEvent event) {
|
||||
// make sure plugin is enabled
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
//disabling plugin in world
|
||||
if (event.getBlock() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getBlock().getWorld()))
|
||||
return;
|
||||
@ -360,9 +359,6 @@ public class JobsPaymentListener implements Listener {
|
||||
if (block == null)
|
||||
return;
|
||||
|
||||
// make sure plugin is enabled
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
Player player = event.getPlayer();
|
||||
|
||||
if (!player.isOnline())
|
||||
@ -429,6 +425,9 @@ public class JobsPaymentListener implements Listener {
|
||||
|
||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||
public void onBlockPlace(BlockPlaceEvent event) {
|
||||
// make sure plugin is enabled
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
Block block = event.getBlock();
|
||||
|
||||
if (block == null)
|
||||
@ -438,10 +437,6 @@ public class JobsPaymentListener implements Listener {
|
||||
if (!Jobs.getGCManager().canPerformActionInWorld(block.getWorld()))
|
||||
return;
|
||||
|
||||
// make sure plugin is enabled
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
|
||||
// check to make sure you can build
|
||||
if (!event.canBuild())
|
||||
return;
|
||||
@ -466,11 +461,11 @@ public class JobsPaymentListener implements Listener {
|
||||
|
||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||
public void onPlayerFish(PlayerFishEvent event) {
|
||||
//disabling plugin in world
|
||||
if (event.getPlayer() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getPlayer().getWorld()))
|
||||
return;
|
||||
// make sure plugin is enabled
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
//disabling plugin in world
|
||||
if (event.getPlayer() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getPlayer().getWorld()))
|
||||
return;
|
||||
|
||||
Player player = event.getPlayer();
|
||||
@ -493,6 +488,9 @@ public class JobsPaymentListener implements Listener {
|
||||
|
||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||
public void onAnimalTame(EntityTameEvent event) {
|
||||
// make sure plugin is enabled
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
//disabling plugin in world
|
||||
if (event.getEntity() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getEntity().getWorld()))
|
||||
return;
|
||||
@ -506,10 +504,6 @@ public class JobsPaymentListener implements Listener {
|
||||
return;
|
||||
}
|
||||
|
||||
// make sure plugin is enabled
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
|
||||
Player player = (Player) event.getOwner();
|
||||
|
||||
if (player == null)
|
||||
@ -532,11 +526,11 @@ public class JobsPaymentListener implements Listener {
|
||||
@SuppressWarnings({ "deprecation", "incomplete-switch" })
|
||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||
public void onInventoryCraft(CraftItemEvent event) {
|
||||
//disabling plugin in world
|
||||
if (event.getWhoClicked() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getWhoClicked().getWorld()))
|
||||
return;
|
||||
// make sure plugin is enabled
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
//disabling plugin in world
|
||||
if (event.getWhoClicked() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getWhoClicked().getWorld()))
|
||||
return;
|
||||
|
||||
// If event is nothing or place, do nothing
|
||||
@ -734,11 +728,11 @@ public class JobsPaymentListener implements Listener {
|
||||
|
||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||
public void onInventoryRepair(InventoryClickEvent event) {
|
||||
//disabling plugin in world
|
||||
if (event.getWhoClicked() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getWhoClicked().getWorld()))
|
||||
return;
|
||||
// make sure plugin is enabled
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
//disabling plugin in world
|
||||
if (event.getWhoClicked() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getWhoClicked().getWorld()))
|
||||
return;
|
||||
Inventory inv = event.getInventory();
|
||||
|
||||
@ -810,11 +804,11 @@ public class JobsPaymentListener implements Listener {
|
||||
|
||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||
public void onEnchantItem(EnchantItemEvent event) {
|
||||
//disabling plugin in world
|
||||
if (event.getEnchanter() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getEnchanter().getWorld()))
|
||||
return;
|
||||
// make sure plugin is enabled
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
//disabling plugin in world
|
||||
if (event.getEnchanter() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getEnchanter().getWorld()))
|
||||
return;
|
||||
|
||||
if (event.isCancelled())
|
||||
@ -867,6 +861,8 @@ public class JobsPaymentListener implements Listener {
|
||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||
public void onInventoryMoveItemEventToFurnace(InventoryMoveItemEvent event) {
|
||||
try {
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
if (event.getDestination().getType() != InventoryType.FURNACE)
|
||||
return;
|
||||
if (!Jobs.getGCManager().PreventHopperFillUps)
|
||||
@ -877,8 +873,6 @@ public class JobsPaymentListener implements Listener {
|
||||
//disabling plugin in world
|
||||
if (!Jobs.getGCManager().canPerformActionInWorld(furnace.getWorld()))
|
||||
return;
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
Block block = furnace.getBlock();
|
||||
|
||||
if (block.hasMetadata(furnaceOwnerMetadata))
|
||||
@ -891,7 +885,8 @@ public class JobsPaymentListener implements Listener {
|
||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||
public void onInventoryMoveItemEventToBrewingStand(InventoryMoveItemEvent event) {
|
||||
try {
|
||||
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
if (event.getDestination().getType() != InventoryType.BREWING)
|
||||
return;
|
||||
if (!Jobs.getGCManager().PreventBrewingStandFillUps)
|
||||
@ -902,8 +897,6 @@ public class JobsPaymentListener implements Listener {
|
||||
//disabling plugin in world
|
||||
if (!Jobs.getGCManager().canPerformActionInWorld(stand.getWorld()))
|
||||
return;
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
Block block = stand.getBlock();
|
||||
|
||||
if (block.hasMetadata(brewingOwnerMetadata))
|
||||
@ -915,11 +908,11 @@ public class JobsPaymentListener implements Listener {
|
||||
|
||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||
public void onFurnaceSmelt(FurnaceSmeltEvent event) {
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
//disabling plugin in world
|
||||
if (event.getBlock() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getBlock().getWorld()))
|
||||
return;
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
Block block = event.getBlock();
|
||||
if (block == null)
|
||||
return;
|
||||
@ -1133,13 +1126,11 @@ public class JobsPaymentListener implements Listener {
|
||||
|
||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||
public void onHangingPlaceEvent(HangingPlaceEvent event) {
|
||||
|
||||
//disabling plugin in world
|
||||
if (!Jobs.getGCManager().canPerformActionInWorld(event.getEntity().getWorld()))
|
||||
return;
|
||||
|
||||
// make sure plugin is enabled
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
//disabling plugin in world
|
||||
if (!Jobs.getGCManager().canPerformActionInWorld(event.getEntity().getWorld()))
|
||||
return;
|
||||
|
||||
Player player = event.getPlayer();
|
||||
@ -1162,13 +1153,11 @@ public class JobsPaymentListener implements Listener {
|
||||
|
||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||
public void onHangingBreakEvent(HangingBreakByEntityEvent event) {
|
||||
|
||||
//disabling plugin in world
|
||||
if (!Jobs.getGCManager().canPerformActionInWorld(event.getEntity().getWorld()))
|
||||
return;
|
||||
|
||||
// make sure plugin is enabled
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
//disabling plugin in world
|
||||
if (!Jobs.getGCManager().canPerformActionInWorld(event.getEntity().getWorld()))
|
||||
return;
|
||||
|
||||
if (!(event.getRemover() instanceof Player))
|
||||
@ -1290,6 +1279,9 @@ public class JobsPaymentListener implements Listener {
|
||||
|
||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||
public void onCreatureBreed(CreatureSpawnEvent event) {
|
||||
// make sure plugin is enabled
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
//disabling plugin in world
|
||||
if (event.getEntity() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getEntity().getWorld()))
|
||||
return;
|
||||
@ -1302,10 +1294,6 @@ public class JobsPaymentListener implements Listener {
|
||||
|
||||
LivingEntity animal = event.getEntity();
|
||||
|
||||
// make sure plugin is enabled
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
|
||||
double closest = 30.0;
|
||||
Player player = null;
|
||||
for (Player i : Bukkit.getOnlinePlayers()) {
|
||||
@ -1339,11 +1327,11 @@ public class JobsPaymentListener implements Listener {
|
||||
|
||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||
public void onPlayerEat(FoodLevelChangeEvent event) {
|
||||
//disabling plugin in world
|
||||
if (event.getEntity() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getEntity().getWorld()))
|
||||
return;
|
||||
// make sure plugin is enabled
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
//disabling plugin in world
|
||||
if (event.getEntity() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getEntity().getWorld()))
|
||||
return;
|
||||
|
||||
if (!(event.getEntity() instanceof Player))
|
||||
@ -1379,11 +1367,11 @@ public class JobsPaymentListener implements Listener {
|
||||
|
||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||
public void onTntExplode(EntityExplodeEvent event) {
|
||||
//disabling plugin in world
|
||||
if (event.getEntity() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getEntity()))
|
||||
return;
|
||||
// make sure plugin is enabled
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
//disabling plugin in world
|
||||
if (event.getEntity() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getEntity()))
|
||||
return;
|
||||
|
||||
if (!Jobs.getGCManager().isUseTntFinder())
|
||||
@ -1445,11 +1433,11 @@ public class JobsPaymentListener implements Listener {
|
||||
|
||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||
public void onPlayerInteract(PlayerInteractEvent event) {
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
//disabling plugin in world
|
||||
if (event.getPlayer() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getPlayer().getWorld()))
|
||||
return;
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
|
||||
Block block = event.getClickedBlock();
|
||||
if (block == null)
|
||||
@ -1515,11 +1503,11 @@ public class JobsPaymentListener implements Listener {
|
||||
|
||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||
public void onPlayerItemConsume(PlayerItemConsumeEvent event) {
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
//disabling plugin in world
|
||||
if (event.getPlayer() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getPlayer().getWorld()))
|
||||
return;
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
|
||||
if (event.isCancelled())
|
||||
return;
|
||||
@ -1547,6 +1535,9 @@ public class JobsPaymentListener implements Listener {
|
||||
|
||||
@EventHandler
|
||||
public void onExplore(JobsChunkChangeEvent event) {
|
||||
// make sure plugin is enabled
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
//disabling plugin in world
|
||||
if (event.getPlayer() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getPlayer().getWorld()))
|
||||
return;
|
||||
@ -1557,6 +1548,9 @@ public class JobsPaymentListener implements Listener {
|
||||
|
||||
Player player = event.getPlayer();
|
||||
|
||||
if (!player.isOnline())
|
||||
return;
|
||||
|
||||
if (!Jobs.getGCManager().payExploringWhenFlying() && player.isFlying())
|
||||
return;
|
||||
|
||||
@ -1565,13 +1559,6 @@ public class JobsPaymentListener implements Listener {
|
||||
if (!respond.isNewChunk())
|
||||
return;
|
||||
|
||||
// make sure plugin is enabled
|
||||
if (!this.plugin.isEnabled())
|
||||
return;
|
||||
|
||||
if (!player.isOnline())
|
||||
return;
|
||||
|
||||
// check if in creative
|
||||
if (player.getGameMode().equals(GameMode.CREATIVE) && !Jobs.getGCManager().payInCreative())
|
||||
return;
|
||||
|
@ -1,15 +1,14 @@
|
||||
package com.gamingmesh.jobs.stuff;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
public class Debug {
|
||||
public static void D(Object message) {
|
||||
Player player = Bukkit.getPlayer("Zrips");
|
||||
if (player == null)
|
||||
return;
|
||||
player.sendMessage(ChatColor.DARK_GRAY + "[Jobs Debug] " + ChatColor.DARK_AQUA + ChatColor.translateAlternateColorCodes('&', String.valueOf(message)));
|
||||
return;
|
||||
}
|
||||
public static void D(Object message) {
|
||||
Player player = Bukkit.getPlayer("Zrips");
|
||||
if (player == null)
|
||||
return;
|
||||
player.sendMessage(org.bukkit.ChatColor.translateAlternateColorCodes('&', "&8[Jobs Debug]&3 " + String.valueOf(message)));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,68 +0,0 @@
|
||||
# Enabled - with this false this schedule will be ignored
|
||||
# From and Until is in 24 hours format with : signs to separate minutes and seconds
|
||||
# Exp and Money determines how big is boost, to reset it. keep it at 1.0. so if you use 2.0 that means all money/exp is doubled
|
||||
# Days variables: Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday, All
|
||||
# Jobs can be any of your settup job or use All to give for all jobs at once
|
||||
# BroadcastOnStart or BroadcastOnStop - set it false to disable message when boost starts/stops
|
||||
# MessageOnStart or MessageOnStop - optional messages, if not given, then message from locale file will be shown
|
||||
# BroadcastInterval - how often in minutes to broadcast message about money/exp boost for jobs
|
||||
# BroadcastMessage - message to show every x minutes
|
||||
|
||||
Boost:
|
||||
NightBoost:
|
||||
Enabled: false
|
||||
From: '23:00:00'
|
||||
Until: '07:00:00'
|
||||
Exp: 2.0
|
||||
Money: 2.0
|
||||
Days:
|
||||
- All
|
||||
Jobs:
|
||||
- All
|
||||
BroadcastOnStart: true
|
||||
MessageOnStart:
|
||||
- '&e***********************************************'
|
||||
- '&e* All jobs got 2x rate for exp and money!'
|
||||
- '&e* For limited time only!'
|
||||
- '&e***********************************************'
|
||||
BroadcastOnStop: true
|
||||
MessageOnStop:
|
||||
- '&e***********************************************'
|
||||
- '&e* Boost time for jobs have beed stoped'
|
||||
- '&e* All rates reseted to original ones'
|
||||
- '&e***********************************************'
|
||||
BroadcastInterval: 15
|
||||
BroadcastMessage:
|
||||
- '&e******************************************************'
|
||||
- '&e* 2x boost time for all jobs is activated until [until] *'
|
||||
- '&e******************************************************'
|
||||
ShortMoneyBoost:
|
||||
Enabled: false
|
||||
From: '07:00:00'
|
||||
Until: '08:00:00'
|
||||
Exp: 1.0
|
||||
Money: 2.0
|
||||
Days:
|
||||
- Sunday
|
||||
- Saturday
|
||||
Jobs:
|
||||
- Miner
|
||||
- Woodcutter
|
||||
BroadcastOnStart: true
|
||||
MessageOnStart:
|
||||
- '&e***********************************************'
|
||||
- '&e* Miner and Woodcutter got 2x rate for money!'
|
||||
- '&e* Until 8AM!'
|
||||
- '&e***********************************************'
|
||||
BroadcastOnStop: true
|
||||
MessageOnStop:
|
||||
- '&e***********************************************'
|
||||
- '&e* Boost time for Miner and Woodcutter have beed stoped'
|
||||
- '&e* Money rates reseted to original ones'
|
||||
- '&e***********************************************'
|
||||
BroadcastInterval: 15
|
||||
BroadcastMessage:
|
||||
- '&e******************************************************'
|
||||
- '&e* 2x money boost time for Miner and Woodcutter jobs'
|
||||
- '&e* Is activated until [until]'
|
||||
- '&e******************************************************'
|
@ -1,111 +0,0 @@
|
||||
Items:
|
||||
SuperPickAxe:
|
||||
# (REQUIRED) Item price in Jobs Points
|
||||
Price: 10000.0
|
||||
Icon:
|
||||
# (REQUIRED) Icon item id
|
||||
Id: 278
|
||||
# (Optional - Default: 0) Icon item data value
|
||||
Data: 0
|
||||
# (Optional - Default: 1) Icon item amount
|
||||
Amount: 1
|
||||
# (Optional) Icon name. Supports usual color codes
|
||||
Name: "&eBest pick axe ever!"
|
||||
# (Optional) Icon lore. Supports usual color codes
|
||||
Lore:
|
||||
- "&6Efficiency V"
|
||||
- "&6Unbreaking III"
|
||||
- "&eAnd one tasty apple!"
|
||||
# (Optional - default: false) Hides icon if player dont have permission to get this item
|
||||
HideWithoutPermission: true
|
||||
# (Optional) List of permissions required to buy this item
|
||||
RequiredPermission:
|
||||
- jobs.item.pickaxe
|
||||
# (Optional) List of jobs and levels to buy this item
|
||||
RequiredJobLevels:
|
||||
- Miner-50
|
||||
- Woodcutter-10
|
||||
# (Optional) Total level from all jobs player currently in
|
||||
RequiredTotalLevels: 100
|
||||
# (Optional) Performs comands on item purchase
|
||||
# use 'msg ' at start of command to send nice message to player
|
||||
# all other commands will be performed normaly as they would be executed from console
|
||||
# use [player] variable to include buyers name
|
||||
PerformCommands:
|
||||
- "msg &eThanks for buying this super pick axe!"
|
||||
# (Optional) Gives items by defined criteria
|
||||
GiveItems:
|
||||
# Can be any word
|
||||
PickAxe:
|
||||
# (Required) Item id
|
||||
Id: 278
|
||||
# (Optional - Default: 0) Item data
|
||||
Data: 0
|
||||
# (Optional - Default: 1) Item amount
|
||||
Amount: 1
|
||||
# (Optional) Item name
|
||||
Name: "&eSuper PickAxe"
|
||||
# (Optional) Item lore
|
||||
Lore:
|
||||
- "&eUber pickAxe"
|
||||
# (Optional) Item enchants
|
||||
Enchants:
|
||||
- DIG_SPEED=5
|
||||
- DURABILITY=3
|
||||
# Can be any word
|
||||
Apple:
|
||||
# (Required) Item id
|
||||
Id: 260
|
||||
WoodenShovel:
|
||||
Price: 100.0
|
||||
Icon:
|
||||
Id: 269
|
||||
Name: "&eWooden shovel"
|
||||
HideWithoutPermission: true
|
||||
RequiredPermission:
|
||||
- jobs.item.shovel
|
||||
RequiredJobLevels:
|
||||
- Digger-5
|
||||
PerformCommands:
|
||||
- "msg &eThanks [player] for buying this shovel!"
|
||||
- "give [player] 269 1"
|
||||
LureEnchantBook:
|
||||
Price: 100.0
|
||||
Icon:
|
||||
Id: 403
|
||||
Name: "&eEnchant book"
|
||||
Lore:
|
||||
- "&eContains Lure 3 enchant"
|
||||
HideWithoutPermission: true
|
||||
RequiredPermission:
|
||||
- jobs.item.LureBook
|
||||
RequiredJobLevels:
|
||||
- Fisherman-100
|
||||
PerformCommands:
|
||||
- "msg &eThanks [player] for buying this book!"
|
||||
# (Optional) Gives items by defined criteria
|
||||
GiveItems:
|
||||
# Can be any word
|
||||
Book:
|
||||
# (Required) Item id
|
||||
Id: 403
|
||||
# (Optional) Item enchants
|
||||
Enchants:
|
||||
- LURE=3
|
||||
Elytra:
|
||||
Price: 100000.0
|
||||
Icon:
|
||||
Id: 443
|
||||
Name: "&eAngel wings"
|
||||
HideWithoutPermission: true
|
||||
RequiredPermission:
|
||||
- jobs.item.elytra
|
||||
PerformCommands:
|
||||
- "msg &eThanks [player] for buying Angel Wings!"
|
||||
# (Optional) Gives items by defined criteria
|
||||
GiveItems:
|
||||
# Can be any word
|
||||
Elytra:
|
||||
# (Required) Item id
|
||||
Id: 443
|
||||
|
@ -11,7 +11,7 @@
|
||||
# they will get 15 income and job1 will gain 10 experience and job2 will gain 5 experience.
|
||||
|
||||
Jobs:
|
||||
# must be one word. This job will be ignored as this is just example of all posible actions
|
||||
# Must be one word. This job will be ignored as this is just example of all possible actions.
|
||||
exampleJob:
|
||||
# full name of the job (displayed when browsing a job, used when joining and leaving)
|
||||
# also can be used as a prefix for the user's name if the option is enabled.
|
||||
@ -19,12 +19,11 @@ Jobs:
|
||||
#
|
||||
# NOTE: Must be 1 word
|
||||
fullname: Woodcutter
|
||||
# Shortened version of the name of the job. Used as a prefix when the user has more
|
||||
# than 1 job
|
||||
# Shortened version of the name of the job. Used as a prefix when the user has more than 1 job.
|
||||
shortname: W
|
||||
description: Earns money felling and planting trees
|
||||
description: Earns money felling and planting trees
|
||||
# Full description of job to be shown in job browse command
|
||||
FullDescription:
|
||||
FullDescription:
|
||||
- "&2Get money for:"
|
||||
- " &7Planting trees"
|
||||
- " &7Cutting down trees"
|
||||
@ -41,8 +40,7 @@ Jobs:
|
||||
# [OPTIONAL] - the maximum level of this class with specific permission
|
||||
# use jobs.[jobsname].vipmaxlevel, in this case it will be jobs.exampleJob.vipmaxlevel
|
||||
vip-max-level: 20
|
||||
# [OPTIONAL] - the maximum number of users on the server that can have this job at
|
||||
# any one time (includes offline players).
|
||||
# [OPTIONAL] - the maximum number of users on the server that can have this job at any one time (includes offline players).
|
||||
slots: 1
|
||||
# [OPTIONAL] Soft limits will allow to stop income/exp/point payment increase at some particular level but allow further general leveling.
|
||||
# In example if player is level 70, he will get paid as he would be at level 50, exp gain will be as he would be at lvl 40 and point gain will be as at level 60
|
||||
@ -83,8 +81,11 @@ Jobs:
|
||||
Gui:
|
||||
# id of block
|
||||
Id: 17
|
||||
# data of block, usualy its 0, but in example Diorite will have id of 1 and data of 3
|
||||
# data of block, usually its 0, but in example Diorite will have id of 1 and data of 3
|
||||
Data: 2
|
||||
# enchants in the item
|
||||
Enchantments:
|
||||
- 'DURABILITY:1'
|
||||
# Defines maximum amount of daily quests player can have from THIS job
|
||||
# This will not have effect on overall quest amount player will have
|
||||
maxDailyQuests: 3
|
||||
@ -92,7 +93,7 @@ Jobs:
|
||||
# Each job can have as many daily quests as you want
|
||||
# Players will have access to quests from jobs he is currently working at
|
||||
Quests:
|
||||
# Quest identification. Can be any ONE word or number or both of them. This doesnt have any real meaning but it cant repeat
|
||||
# Quest identification. Can be any ONE word or number or both of them. This doesn't have any real meaning but it can't repeat.
|
||||
1:
|
||||
# Quest name used for quests list, don't forget to enclose it with " "
|
||||
Name: "Break Oak wood"
|
||||
@ -127,10 +128,10 @@ Jobs:
|
||||
Action: Kill
|
||||
Target: Zombie
|
||||
Amount: 50
|
||||
RewardCommands:
|
||||
RewardCommands:
|
||||
- "money give [playerName] 2000"
|
||||
- "msg [playerName] Completed quest!"
|
||||
RewardDesc:
|
||||
RewardDesc:
|
||||
- "Kill 50 zombies"
|
||||
- "Get 2000 for this!"
|
||||
3:
|
||||
@ -138,10 +139,10 @@ Jobs:
|
||||
Action: Smelt
|
||||
Target: "COOKED_CHICKEN"
|
||||
Amount: 20
|
||||
RewardCommands:
|
||||
RewardCommands:
|
||||
- "money give [playerName] 300"
|
||||
- "msg [playerName] Completed quest!"
|
||||
RewardDesc:
|
||||
RewardDesc:
|
||||
- "Cook some chicken breasts"
|
||||
- "Get 300 for this!"
|
||||
########################################################################
|
||||
@ -200,15 +201,14 @@ Jobs:
|
||||
# Witch
|
||||
# Wither
|
||||
# Wolf
|
||||
# Zombie
|
||||
# Zombie
|
||||
# ZombieVillager
|
||||
# ZombieHusk
|
||||
#
|
||||
#
|
||||
# NOTE: mob names are case sensitive.
|
||||
#
|
||||
# For custom-kill, it is the name of the job (also case sensitive).
|
||||
#
|
||||
#
|
||||
# NOTE: If a job has both the pay for killing a player and for killing a
|
||||
# specific class, they will get both payments.
|
||||
########################################################################
|
||||
@ -222,7 +222,7 @@ Jobs:
|
||||
points: 5.0
|
||||
# base experience
|
||||
experience: 5.0
|
||||
# (OPTIONAL) from which level of this job player can get money for this action
|
||||
# (OPTIONAL) from which level of this job player can get money for this action
|
||||
# if not given, then player will always get money for this action
|
||||
# this can be used for any action
|
||||
from-level: 1
|
||||
@ -230,6 +230,10 @@ Jobs:
|
||||
# if not given, then there is no limit
|
||||
# this can be used for any action
|
||||
until-level: 30
|
||||
13:
|
||||
# you can use minuses to take away money if the player break this block
|
||||
income: -1.0
|
||||
experience: -1.0
|
||||
# payment for drinking a potion
|
||||
Drink:
|
||||
POTION:
|
||||
@ -249,11 +253,11 @@ Jobs:
|
||||
experience: 5.0
|
||||
# payment for placing a block
|
||||
Place:
|
||||
SAPLING:
|
||||
SAPLING:
|
||||
income: 1.0
|
||||
points: 1.0
|
||||
experience: 1.0
|
||||
WOOD:
|
||||
WOOD:
|
||||
income: 2.0
|
||||
points: 2.0
|
||||
experience: 2.0
|
||||
@ -278,7 +282,7 @@ Jobs:
|
||||
Woodcutter:
|
||||
income: 10.0
|
||||
experience: 10.0
|
||||
# Tamig animals
|
||||
# Taming animals
|
||||
Tame:
|
||||
Wolf:
|
||||
income: 2.0
|
||||
@ -295,13 +299,13 @@ Jobs:
|
||||
experience: 5
|
||||
baked_potato:
|
||||
income: 5
|
||||
experience: 5
|
||||
experience: 5
|
||||
# Milking cows, only one option is available
|
||||
Milk:
|
||||
Cow:
|
||||
income: 2.0
|
||||
experience: 5.0
|
||||
Mushroomcow:
|
||||
MushroomCow:
|
||||
income: 5.0
|
||||
experience: 10.0
|
||||
# Shear sheeps by its color
|
||||
@ -311,51 +315,51 @@ Jobs:
|
||||
experience: 5.0
|
||||
Blue:
|
||||
income: 2.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
Brown:
|
||||
income: 2.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
Cyan:
|
||||
income: 2.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
Gray:
|
||||
income: 2.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
Green:
|
||||
income: 2.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
Light_blue:
|
||||
income: 2.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
Lime:
|
||||
income: 2.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
Magenta:
|
||||
income: 2.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
Orange:
|
||||
income: 2.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
Pink:
|
||||
income: 2.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
Purple:
|
||||
income: 2.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
Red:
|
||||
income: 2.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
Silver:
|
||||
income: 2.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
White:
|
||||
income: 2.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
Yellow:
|
||||
income: 2.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
# dyeing armor
|
||||
Dye:
|
||||
Dye:
|
||||
LEATHER_BOOTS:
|
||||
income: 1.0
|
||||
experience: 1.0
|
||||
@ -452,7 +456,7 @@ Jobs:
|
||||
aaaaaatest.node:
|
||||
# true to give, false to revoke
|
||||
value: true
|
||||
# minimum level needed to grant permission. Use 0 for all levels
|
||||
# minimum level needed to grant permission. Use 0 for all levels
|
||||
level: 0
|
||||
aaaaaatest.node2:
|
||||
value: true
|
||||
@ -470,7 +474,7 @@ Jobs:
|
||||
- p:essentials.notnoob
|
||||
perform:
|
||||
# p marks permission, player will get if given true value, if used false, permission will be taken
|
||||
- p:essentials.fly-true
|
||||
- p:essentials.fly-true
|
||||
# Commands executed when player reached level
|
||||
commands:
|
||||
# command name, just to have better idea what this do
|
||||
@ -487,9 +491,9 @@ Jobs:
|
||||
command: manuaddp [player] essentials.kits.woodcutter
|
||||
levelFrom: 150
|
||||
levelUntil: 150
|
||||
# Getting more money when equiped with specific weapon/tool ar wearing armor
|
||||
# Getting more money when equipped with specific weapon/tool are wearing armor
|
||||
items:
|
||||
# Just name, dont have any impact
|
||||
# Just name, don't have any impact
|
||||
firstOne:
|
||||
# Tool/Weapon id. Works for block Break, Fish, Animal tame, Breed, Monster/Player kill.
|
||||
id: 278
|
||||
@ -520,7 +524,7 @@ Jobs:
|
||||
expBoost: 1.1
|
||||
# Limit item use to jobs level
|
||||
limitedItems:
|
||||
# Just name, dont have any impact
|
||||
# Just name, don't have any impact
|
||||
firstOne:
|
||||
# Tool/Weapon id. Works for any interact action.
|
||||
id: 278
|
||||
@ -533,7 +537,7 @@ Jobs:
|
||||
- '&eBobs pick'
|
||||
- '&710% bonus XP'
|
||||
# (optional) Item enchantments, all enchantment names can be found https://hub.spigotmc.org/javadocs/spigot/org/bukkit/enchantments/Enchantment.html
|
||||
# enchant level can inrease with jobs level to give best RPG experiance
|
||||
# enchant level can increase with jobs level to give best RPG experience
|
||||
enchants:
|
||||
- DAMAGE_ALL=1
|
||||
- FIRE_ASPECT=1
|
||||
@ -1156,11 +1160,11 @@ Jobs:
|
||||
Id: 290
|
||||
Data: 0
|
||||
Tame:
|
||||
Wolf:
|
||||
Wolf:
|
||||
income: 5.0
|
||||
points: 5.0
|
||||
experience: 5.0
|
||||
Horse:
|
||||
Horse:
|
||||
income: 5.0
|
||||
points: 5.0
|
||||
experience: 5.0
|
||||
@ -1205,63 +1209,63 @@ Jobs:
|
||||
Orange:
|
||||
income: 4.0
|
||||
points: 4.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
Yellow:
|
||||
income: 4.0
|
||||
points: 4.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
Green:
|
||||
income: 4.0
|
||||
points: 4.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
Blue:
|
||||
income: 4.0
|
||||
points: 4.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
'Light Blue':
|
||||
income: 4.0
|
||||
points: 4.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
Magenta:
|
||||
income: 4.0
|
||||
points: 4.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
Pink:
|
||||
income: 4.0
|
||||
points: 4.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
White:
|
||||
income: 4.0
|
||||
points: 4.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
'Light Gray':
|
||||
income: 4.0
|
||||
points: 4.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
Black:
|
||||
income: 4.0
|
||||
points: 4.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
Brown:
|
||||
income: 4.0
|
||||
points: 4.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
Purple:
|
||||
income: 4.0
|
||||
points: 4.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
Cyan:
|
||||
income: 4.0
|
||||
points: 4.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
Gray:
|
||||
income: 4.0
|
||||
points: 4.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
'Lime Green':
|
||||
income: 4.0
|
||||
points: 4.0
|
||||
experience: 5.0
|
||||
experience: 5.0
|
||||
Milk:
|
||||
Cow:
|
||||
income: 5.0
|
||||
@ -1503,7 +1507,7 @@ Jobs:
|
||||
rejoinCooldown: 10
|
||||
Gui:
|
||||
Id: 301
|
||||
Data: 0
|
||||
Data: 0
|
||||
Explore:
|
||||
1:
|
||||
income: 5.0
|
||||
@ -1544,7 +1548,7 @@ Jobs:
|
||||
rejoinCooldown: 10
|
||||
Gui:
|
||||
Id: 61
|
||||
Data: 0
|
||||
Data: 0
|
||||
Craft:
|
||||
'280':
|
||||
income: 0.1
|
||||
|
@ -5,7 +5,7 @@ version: 4.8.0
|
||||
api-version: 1.13
|
||||
website: https://www.spigotmc.org/resources/jobs-reborn.4216/
|
||||
author: phrstbrn
|
||||
softdepend: [Vault, iConomy, MythicMobs, McMMO, WorldGuard, MyPet]
|
||||
softdepend: [Vault, MythicMobs, McMMO, WorldGuard, MyPet]
|
||||
commands:
|
||||
jobs:
|
||||
description: Jobs
|
||||
|
Loading…
Reference in New Issue
Block a user