From 7c868276727ec878c50bd08a9a83533de05d97f2 Mon Sep 17 00:00:00 2001 From: Jsinco Date: Wed, 12 Jun 2024 17:35:58 -0400 Subject: [PATCH 1/2] Add config option to disable tamed animal payouts --- pom.xml | 6 +++++- .../com/gamingmesh/jobs/config/GeneralConfigManager.java | 8 +++++--- .../gamingmesh/jobs/listeners/JobsPaymentListener.java | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index e42fd4da..446ba74d 100644 --- a/pom.xml +++ b/pom.xml @@ -253,8 +253,12 @@ maven-jar-plugin 2.3.1 - D:\MC\Server 1.20.5\plugins\ + ${basedir}/build/jar + + diff --git a/src/main/java/com/gamingmesh/jobs/config/GeneralConfigManager.java b/src/main/java/com/gamingmesh/jobs/config/GeneralConfigManager.java index c6957851..b0c91d4b 100644 --- a/src/main/java/com/gamingmesh/jobs/config/GeneralConfigManager.java +++ b/src/main/java/com/gamingmesh/jobs/config/GeneralConfigManager.java @@ -46,7 +46,6 @@ import net.Zrips.CMILib.Equations.Parser; import net.Zrips.CMILib.FileHandler.ConfigReader; import net.Zrips.CMILib.Items.CMIItemStack; import net.Zrips.CMILib.Items.CMIMaterial; -import net.Zrips.CMILib.Logs.CMIDebug; import net.Zrips.CMILib.Messages.CMIMessages; import net.Zrips.CMILib.Version.Version; @@ -106,7 +105,7 @@ public class GeneralConfigManager { EmptyServerAccountActionBar, ActionBarsMessageByDefault, aBarSilentMode, ShowTotalWorkers, ShowPenaltyBonus, useDynamicPayment, JobsGUIOpenOnBrowse, JobsGUIShowChatBrowse, JobsGUISwitcheButtons, ShowActionNames, hideItemAttributes, DisableJoiningJobThroughGui, FireworkLevelupUse, UseRandom, UsePerPermissionForLeaving, - EnableConfirmation, jobsInfoOpensBrowse, MonsterDamageUse, MonsterDamageIgnoreBosses, useMaxPaymentCurve, blockOwnershipTakeOver, + EnableConfirmation, jobsInfoOpensBrowse, MonsterDamageUse, MonsterDamageIgnoreBosses, tameablesPayout, useMaxPaymentCurve, blockOwnershipTakeOver, hideJobsInfoWithoutPermission, UseTaxes, TransferToServerAccount, TakeFromPlayersPayment, AutoJobJoinUse, AllowDelevel, RomanNumbers, BossBarEnabled = false, BossBarShowOnEachAction = false, BossBarsMessageByDefault = false, ExploreCompact, ExploreSaveIntoDatabase = false, DBCleaningJobsUse, DBCleaningUsersUse, DisabledWorldsUse, UseAsWhiteListWorldList, MythicMobsEnabled, @@ -919,7 +918,10 @@ public class GeneralConfigManager { MonsterDamagePercentage = c.get("ExploitProtections.General.MonsterDamage.Percentage", 60); c.addComment("ExploitProtections.General.MonsterDamage.IgnoreBosses", "When enabled we will avoid checking damage done to ender dragon, wither and warden", "This can help out in case you have server with custom damage sources which might not be registered and payouts might not be given out"); - MonsterDamageIgnoreBosses = c.get("ExploitProtections.General.MonsterDamage.IgnoreBosses", true); + MonsterDamageIgnoreBosses = c.get("ExploitProtections.General.MonsterDamage.IgnoreBosses", true); // TODO + + c.addComment("ExploitProtections.General.TameablesPayout", "Should tamed animals payout to their owners?"); + tameablesPayout = c.get("ExploitProtections.General.TameablesPayout", true); c.addComment("ExploitProtections.McMMO", "McMMO abilities"); c.addComment("ExploitProtections.McMMO.TreeFellerMultiplier", "Players will get part of money from cutting trees with treefeller ability enabled.", diff --git a/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java b/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java index 3227ca76..ee92739d 100644 --- a/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java +++ b/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java @@ -1363,7 +1363,7 @@ public final class JobsPaymentListener implements Listener { if (uuid != null) pDamager = Bukkit.getPlayer(uuid); - } else if (isTameable) { // Checking if killer is tamed animal + } else if (isTameable && Jobs.getGCManager().tameablesPayout) { // Checking if killer is tamed animal Tameable t = (Tameable) killer; if (t.isTamed() && t.getOwner() instanceof Player) From 71272dae59298450767e47deb874ee1f49eeab31 Mon Sep 17 00:00:00 2001 From: Jsinco Date: Wed, 10 Jul 2024 06:02:37 -0400 Subject: [PATCH 2/2] update for 1.21 because this pull hasnt been merged yet --- pom.xml | 16 ++++++++-------- .../jobs/listeners/JobsPayment1_20Listener.java | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 4e07283f..718f1f4d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ + xmlns="http://maven.apache.org/POM/4.0.0" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 Jobs jobs @@ -150,11 +150,11 @@ - - - - - + + + + + com.bgsoftware @@ -232,7 +232,7 @@ https://repo.bg-software.com/repository/api/ - diff --git a/src/main/java/com/gamingmesh/jobs/listeners/JobsPayment1_20Listener.java b/src/main/java/com/gamingmesh/jobs/listeners/JobsPayment1_20Listener.java index a375e9cb..f0aa5dfe 100644 --- a/src/main/java/com/gamingmesh/jobs/listeners/JobsPayment1_20Listener.java +++ b/src/main/java/com/gamingmesh/jobs/listeners/JobsPayment1_20Listener.java @@ -16,7 +16,7 @@ import com.gamingmesh.jobs.container.JobsPlayer; public class JobsPayment1_20Listener implements Listener { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - public void onEntityBucketed(BlockDropItemEvent event) { + public void onBlockDropItem(BlockDropItemEvent event) { Player player = event.getPlayer();