From 85626adedb560cb581aa79b0ab323b86a0bf3ba0 Mon Sep 17 00:00:00 2001
From: "Alex \"mcmonkey\" Goodwin" <agoodwin@freneticllc.com>
Date: Mon, 27 May 2019 16:52:45 -0700
Subject: [PATCH] initial update for 1.14.2

---
 pom.xml                                                     | 2 +-
 v1_14_R1/pom.xml                                            | 4 ++--
 .../java/net/aufdemrand/denizen/nms/Handler_v1_14_R1.java   | 2 +-
 .../denizen/nms/helpers/FishingHelper_v1_14_R1.java         | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0723792c72..8f05eeffe4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <craftbukkit.version>1.14.1-R0.1-SNAPSHOT</craftbukkit.version>
+        <craftbukkit.version>1.14.2-R0.1-SNAPSHOT</craftbukkit.version>
         <citizens.version>2.0.25-SNAPSHOT</citizens.version>
         <dcore.version>1.40-SNAPSHOT</dcore.version>
         <BUILD_NUMBER>Unknown</BUILD_NUMBER>
diff --git a/v1_14_R1/pom.xml b/v1_14_R1/pom.xml
index cb1483d168..19e1d38e37 100644
--- a/v1_14_R1/pom.xml
+++ b/v1_14_R1/pom.xml
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.14.1-R0.1-SNAPSHOT</version>
+            <version>1.14.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.14.1-R0.1-SNAPSHOT</version>
+            <version>1.14.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
diff --git a/v1_14_R1/src/main/java/net/aufdemrand/denizen/nms/Handler_v1_14_R1.java b/v1_14_R1/src/main/java/net/aufdemrand/denizen/nms/Handler_v1_14_R1.java
index b5d3c87c6e..46c59061c0 100644
--- a/v1_14_R1/src/main/java/net/aufdemrand/denizen/nms/Handler_v1_14_R1.java
+++ b/v1_14_R1/src/main/java/net/aufdemrand/denizen/nms/Handler_v1_14_R1.java
@@ -73,7 +73,7 @@ public void undisableAsyncCatcher() {
 
     @Override
     public boolean isCorrectMappingsCode() {
-        return ((CraftMagicNumbers) CraftMagicNumbers.INSTANCE).getMappingsVersion().equals("48be70f51ffe914d865f175ed3bf992d");
+        return ((CraftMagicNumbers) CraftMagicNumbers.INSTANCE).getMappingsVersion().equals("28fc84e92753a1f24483290e13e0ee4c");
     }
 
     @Override
diff --git a/v1_14_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/FishingHelper_v1_14_R1.java b/v1_14_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/FishingHelper_v1_14_R1.java
index 338a7a686a..84cf2cdd82 100644
--- a/v1_14_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/FishingHelper_v1_14_R1.java
+++ b/v1_14_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/FishingHelper_v1_14_R1.java
@@ -73,7 +73,7 @@ private ItemStack catchRandomJunk(EntityFishingHook fishHook) {
         //playerFishEvent2.luck((float) EnchantmentManager.a(Enchantments.LUCK, fishHook.owner) + fishHook.owner.dJ());
         LootTableRegistry registry = fishHook.getWorld().getMinecraftServer().getLootTableRegistry();
         List<ItemStack> itemStacks = registry.getLootTable(LootTables.ac)
-                .populateLoot(playerFishEvent2.build(registry.getLootTable(LootTables.ac).a()));
+                .populateLoot(playerFishEvent2.build(registry.getLootTable(LootTables.ac).getLootContextParameterSet()));
         return itemStacks.get(worldServer.random.nextInt(itemStacks.size()));
     }
 
@@ -85,7 +85,7 @@ private ItemStack catchRandomTreasure(EntityFishingHook fishHook) {
         //playerFishEvent2.luck((float) EnchantmentManager.a(Enchantments.LUCK, fishHook.owner) + fishHook.owner.dJ());
         LootTableRegistry registry = fishHook.getWorld().getMinecraftServer().getLootTableRegistry();
         List<ItemStack> itemStacks = registry.getLootTable(LootTables.ad)
-                .populateLoot(playerFishEvent2.build(registry.getLootTable(LootTables.ad).a()));
+                .populateLoot(playerFishEvent2.build(registry.getLootTable(LootTables.ad).getLootContextParameterSet()));
         return itemStacks.get(worldServer.random.nextInt(itemStacks.size()));
     }
 
@@ -98,7 +98,7 @@ private ItemStack catchRandomFish(EntityFishingHook fishHook) {
         //playerFishEvent2.luck((float) EnchantmentManager.a(Enchantments.LUCK, fishHook.owner) + fishHook.owner.dJ());
         LootTableRegistry registry = fishHook.getWorld().getMinecraftServer().getLootTableRegistry();
         List<ItemStack> itemStacks = registry.getLootTable(LootTables.ae)
-                .populateLoot(playerFishEvent2.build(registry.getLootTable(LootTables.ae).a()));
+                .populateLoot(playerFishEvent2.build(registry.getLootTable(LootTables.ae).getLootContextParameterSet()));
         return itemStacks.get(worldServer.random.nextInt(itemStacks.size()));
     }
 }