Merge pull request #1725 from FireML/fix-event

Fix NPEs for JobsExpGainEvent
Zrips · Apr 15, 2024 · abd04d9 · abd04d9
2 parents 0ab6c20 + 59b6101
commit abd04d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/src/main/java/com/gamingmesh/jobs/Jobs.java b/src/main/java/com/gamingmesh/jobs/Jobs.java
@@ -1453,7 +1453,8 @@ public static void perform(JobsPlayer jPlayer, ActionInfo info, BufferedPayment
         payment.set(CurrencyType.MONEY, jobsPrePaymentEvent.getAmount());
         payment.set(CurrencyType.POINTS, jobsPrePaymentEvent.getPoints());
 
-        JobsExpGainEvent jobsExpGainEvent = new JobsExpGainEvent(payment.getOfflinePlayer(), job, expPayment);
+        JobsExpGainEvent jobsExpGainEvent = new JobsExpGainEvent(payment.getOfflinePlayer(), job, expPayment,
+                block, ent, victim, info);
         Bukkit.getServer().getPluginManager().callEvent(jobsExpGainEvent);
         // If event is canceled, don't do anything
         if (jobsExpGainEvent.isCancelled())

diff --git a/src/main/java/com/gamingmesh/jobs/api/JobsExpGainEvent.java b/src/main/java/com/gamingmesh/jobs/api/JobsExpGainEvent.java
@@ -24,16 +24,11 @@ public final class JobsExpGainEvent extends BaseEvent implements Cancellable {
 
     private boolean cancelled = false;
 
-    public JobsExpGainEvent(OfflinePlayer offlinePlayer, Job job, double exp) {
-	this.offlinePlayer = offlinePlayer;
-	this.job = job;
-	this.exp = exp;
-    }
-
     public JobsExpGainEvent(OfflinePlayer offlinePlayer, Job job, double exp, Block block,
 		Entity entity, LivingEntity living, ActionInfo info) {
-	this(offlinePlayer, job, exp);
-
+    this.offlinePlayer = offlinePlayer;
+    this.job = job;
+    this.exp = exp;
 	this.block = block;
 	this.entity = entity;
 	this.living = living;