Initial update to 1.9.4 - lots of TODOs

DenizenScript · May 10, 2016 · b3132f6 · b3132f6
1 parent c7e0a23
commit b3132f6
Show file tree

Hide file tree

Showing 68 changed files with 248 additions and 238 deletions.
diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <craftbukkit.version>1.9.2-R0.1-SNAPSHOT</craftbukkit.version>
+        <craftbukkit.version>1.9.4-R0.1-SNAPSHOT</craftbukkit.version>
         <json.version>20090211</json.version>
         <citizens.version>2.0.17-SNAPSHOT</citizens.version>
         <BUILD_NUMBER>Unknown</BUILD_NUMBER>

diff --git a/src/main/java/net/aufdemrand/denizen/Denizen.java b/src/main/java/net/aufdemrand/denizen/Denizen.java
@@ -366,9 +366,9 @@ public RequirementChecker getRequirementChecker() {
     @Override
     public void onEnable() {
         try {
-            net.minecraft.server.v1_9_R1.Block.getById(0);
+            net.minecraft.server.v1_9_R2.Block.getById(0);
         }
-        catch (NoClassDefFoundError e) {
+        catch (Throwable e) {
             getLogger().warning("-------------------------------------");
             getLogger().warning("This Denizen version is not compatible with this CraftBukkit version! Deactivating Denizen!");
             getLogger().warning("-------------------------------------");
@@ -1600,7 +1600,7 @@ else if (comparedto.equalsIgnoreCase("cuboid")) {
 
     @Override
     public Thread getMainThread() {
-        return net.minecraft.server.v1_9_R1.MinecraftServer.getServer().primaryThread;
+        return net.minecraft.server.v1_9_R2.MinecraftServer.getServer().primaryThread;
     }
 }
 

diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/FishingTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/FishingTrait.java
@@ -6,10 +6,10 @@
 import net.citizensnpcs.api.persistence.Persist;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.util.PlayerAnimation;
-import net.minecraft.server.v1_9_R1.*;
+import net.minecraft.server.v1_9_R2.*;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_9_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_9_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.projectiles.ProjectileSource;
@@ -282,15 +282,15 @@ else if (catchType == CatchType.FISH) {
     private ItemStack catchRandomJunk() {
         fishHook.owner.a(StatisticList.A, 1);
         LootTableInfo.a playerFishEvent2 = new LootTableInfo.a((WorldServer)fishHook.getWorld());
-        playerFishEvent2.a((float)EnchantmentManager.f(fishHook.owner) + fishHook.owner.db());
+        // TODO: 1.9.4: playerFishEvent2.a((float)EnchantmentManager.f(fishHook.owner) + fishHook.owner.db());
         List<ItemStack> itemStacks = fishHook.getWorld().ak().a(LootTables.am).a(CoreUtilities.getRandom(), playerFishEvent2.a());
         return itemStacks.get(CoreUtilities.getRandom().nextInt(itemStacks.size()));
     }
 
     private ItemStack catchRandomTreasure() {
         fishHook.owner.a(StatisticList.B, 1);
         LootTableInfo.a playerFishEvent2 = new LootTableInfo.a((WorldServer)fishHook.getWorld());
-        playerFishEvent2.a((float)EnchantmentManager.f(fishHook.owner) + fishHook.owner.db());
+        // TODO: 1.9.4: playerFishEvent2.a((float)EnchantmentManager.f(fishHook.owner) + fishHook.owner.db());
         List<ItemStack> itemStacks = fishHook.getWorld().ak().a(LootTables.an).a(CoreUtilities.getRandom(), playerFishEvent2.a());
         return itemStacks.get(CoreUtilities.getRandom().nextInt(itemStacks.size()));
     }
@@ -299,7 +299,7 @@ private ItemStack catchRandomFish() {
         //float f3 = f - f2;
         fishHook.owner.a(StatisticList.z, 1);
         LootTableInfo.a playerFishEvent2 = new LootTableInfo.a((WorldServer)fishHook.getWorld());
-        playerFishEvent2.a((float)EnchantmentManager.f(fishHook.owner) + fishHook.owner.db());
+        // TODO: 1.9.4: playerFishEvent2.a((float)EnchantmentManager.f(fishHook.owner) + fishHook.owner.db());
         List<ItemStack> itemStacks = fishHook.getWorld().ak().a(LootTables.ao).a(CoreUtilities.getRandom(), playerFishEvent2.a());
         return itemStacks.get(CoreUtilities.getRandom().nextInt(itemStacks.size()));
     }

diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/ParticlesTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/ParticlesTrait.java
@@ -9,7 +9,7 @@
 import org.bukkit.EntityEffect;
 import org.bukkit.Location;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_9_R1.entity.CraftWolf;
+import org.bukkit.craftbukkit.v1_9_R2.entity.CraftWolf;
 import org.bukkit.entity.Wolf;
 
 public class ParticlesTrait extends Trait {

diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/PushableTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/PushableTrait.java
@@ -6,10 +6,10 @@
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.persistence.Persist;
 import net.citizensnpcs.api.trait.Trait;
-import net.minecraft.server.v1_9_R1.EntityLiving;
+import net.minecraft.server.v1_9_R2.EntityLiving;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_9_R1.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_9_R2.entity.CraftLivingEntity;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -199,7 +199,7 @@ public void NPCCompleteDestination(NavigationCompleteEvent event) {
             handle.yaw = returnLocation.getYaw();
             handle.pitch = returnLocation.getPitch();
             // !--- START NMS OBFUSCATED
-            handle.az = handle.yaw; // The head's yaw
+            // TODO: 1.9.4: handle.az = handle.yaw; // The head's yaw
             // !--- END NMS OBFUSCATED
             pushed = false;
             // Push Return action

diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/SneakingTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/SneakingTrait.java
@@ -3,8 +3,8 @@
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.citizensnpcs.api.persistence.Persist;
 import net.citizensnpcs.api.trait.Trait;
-import net.minecraft.server.v1_9_R1.EntityHuman;
-import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer;
+import net.minecraft.server.v1_9_R2.EntityHuman;
+import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.event.Listener;
 

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dChunk.java b/src/main/java/net/aufdemrand/denizen/objects/dChunk.java
@@ -13,7 +13,7 @@
 import org.bukkit.ChunkSnapshot;
 import org.bukkit.Location;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_9_R1.CraftChunk;
+import org.bukkit.craftbukkit.v1_9_R2.CraftChunk;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.scheduler.BukkitRunnable;

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
@@ -22,13 +22,13 @@
 import net.aufdemrand.denizencore.utilities.CoreUtilities;
 import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.api.npc.NPC;
-import net.minecraft.server.v1_9_R1.*;
+import net.minecraft.server.v1_9_R2.*;
 import org.bukkit.*;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.BlockFace;
-import org.bukkit.craftbukkit.v1_9_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_9_R1.entity.*;
+import org.bukkit.craftbukkit.v1_9_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_9_R2.entity.*;
 import org.bukkit.entity.*;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Item;
@@ -269,7 +269,7 @@ public static Entity getEntityForID(UUID id) {
             return rememberedEntities.get(id);
         }
         for (World world : Bukkit.getWorlds()) {
-            net.minecraft.server.v1_9_R1.Entity nmsEntity = ((CraftWorld) world).getHandle().getEntity(id);
+            net.minecraft.server.v1_9_R2.Entity nmsEntity = ((CraftWorld) world).getHandle().getEntity(id);
 
             // Make sure the nmsEntity is valid, to prevent unpleasant errors
             if (nmsEntity != null) {

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dInventory.java b/src/main/java/net/aufdemrand/denizen/objects/dInventory.java
@@ -25,7 +25,7 @@
 import org.bukkit.Material;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.DoubleChest;
-import org.bukkit.craftbukkit.v1_9_R1.inventory.CraftInventory;
+import org.bukkit.craftbukkit.v1_9_R2.inventory.CraftInventory;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryType;

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dItem.java b/src/main/java/net/aufdemrand/denizen/objects/dItem.java
@@ -18,7 +18,7 @@
 import net.aufdemrand.denizencore.utilities.CoreUtilities;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_9_R1.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_9_R2.inventory.CraftItemStack;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Item;
 import org.bukkit.inventory.ItemStack;

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dLocation.java b/src/main/java/net/aufdemrand/denizen/objects/dLocation.java
@@ -21,15 +21,15 @@
 import net.aufdemrand.denizencore.tags.TagContext;
 import net.aufdemrand.denizencore.tags.core.EscapeTags;
 import net.aufdemrand.denizencore.utilities.CoreUtilities;
-import net.minecraft.server.v1_9_R1.TileEntitySkull;
+import net.minecraft.server.v1_9_R2.TileEntitySkull;
 import org.bukkit.*;
 import org.bukkit.block.*;
 import org.bukkit.block.Banner;
 import org.bukkit.block.Furnace;
 import org.bukkit.block.Sign;
 import org.bukkit.block.Skull;
 import org.bukkit.block.banner.PatternType;
-import org.bukkit.craftbukkit.v1_9_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_9_R2.CraftWorld;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dNPC.java b/src/main/java/net/aufdemrand/denizen/objects/dNPC.java
@@ -35,10 +35,10 @@
 import net.citizensnpcs.trait.Poses;
 import net.citizensnpcs.util.Anchor;
 import net.citizensnpcs.util.Pose;
-import net.minecraft.server.v1_9_R1.EntityLiving;
+import net.minecraft.server.v1_9_R2.EntityLiving;
 import org.bukkit.Material;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_9_R1.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_9_R2.entity.CraftLivingEntity;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.ItemFrame;
@@ -1247,15 +1247,15 @@ public void adjust(Mechanism mechanism) {
             int data = item.getMaterial().getData((byte) 0);
             switch (getEntity().getType()) {
                 case DROPPED_ITEM:
-                    ((org.bukkit.entity.Item) getEntity()).getItemStack().setType(mat);
-                    ((ItemController.ItemNPC) getEntity()).setType(mat, data);
+                    // TODO: 1.9.4: ((org.bukkit.entity.Item) getEntity()).getItemStack().setType(mat);
+                    // TODO: 1.9.4: ((ItemController.ItemNPC) getEntity()).setType(mat, data);
                     break;
                 case ITEM_FRAME:
-                    ((ItemFrame) getEntity()).getItem().setType(mat);
-                    ((ItemFrameController.ItemFrameNPC) getEntity()).setType(mat, data);
+                    // TODO: 1.9.4: ((ItemFrame) getEntity()).getItem().setType(mat);
+                    // TODO: 1.9.4: ((ItemFrameController.ItemFrameNPC) getEntity()).setType(mat, data);
                     break;
                 case FALLING_BLOCK:
-                    ((FallingBlockController.FallingBlockNPC) getEntity()).setType(mat, data);
+                    // TODO: 1.9.4: ((FallingBlockController.FallingBlockNPC) getEntity()).setType(mat, data);
                     break;
                 default:
                     dB.echoError("NPC is the not an item type!");

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java b/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java
@@ -22,14 +22,14 @@
 import net.aufdemrand.denizencore.utilities.CoreUtilities;
 import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.api.npc.NPC;
-import net.minecraft.server.v1_9_R1.PacketPlayOutGameStateChange;
+import net.minecraft.server.v1_9_R2.PacketPlayOutGameStateChange;
 import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.banner.PatternType;
 import org.bukkit.boss.BarColor;
 import org.bukkit.boss.BarStyle;
-import org.bukkit.craftbukkit.v1_9_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_9_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dWorld.java b/src/main/java/net/aufdemrand/denizen/objects/dWorld.java
@@ -15,7 +15,7 @@
 import org.bukkit.Difficulty;
 import org.bukkit.Location;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_9_R1.CraftChunk;
+import org.bukkit.craftbukkit.v1_9_R2.CraftChunk;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 

diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySilent.java b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySilent.java
@@ -6,7 +6,7 @@
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.objects.properties.Property;
 import net.aufdemrand.denizencore.tags.Attribute;
-import org.bukkit.craftbukkit.v1_9_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_9_R2.entity.CraftEntity;
 import org.bukkit.entity.Entity;
 
 public class EntitySilent implements Property {

diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemSkullskin.java b/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemSkullskin.java
@@ -11,11 +11,11 @@
 import net.aufdemrand.denizencore.tags.Attribute;
 import net.aufdemrand.denizencore.utilities.CoreUtilities;
 import net.aufdemrand.denizencore.utilities.debugging.dB;
-import net.minecraft.server.v1_9_R1.GameProfileSerializer;
-import net.minecraft.server.v1_9_R1.ItemStack;
-import net.minecraft.server.v1_9_R1.MinecraftServer;
-import net.minecraft.server.v1_9_R1.NBTTagCompound;
-import org.bukkit.craftbukkit.v1_9_R1.inventory.CraftItemStack;
+import net.minecraft.server.v1_9_R2.GameProfileSerializer;
+import net.minecraft.server.v1_9_R2.ItemStack;
+import net.minecraft.server.v1_9_R2.MinecraftServer;
+import net.minecraft.server.v1_9_R2.NBTTagCompound;
+import org.bukkit.craftbukkit.v1_9_R2.inventory.CraftItemStack;
 import org.bukkit.inventory.meta.SkullMeta;
 
 import java.util.UUID;

diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemUnbreakable.java b/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemUnbreakable.java
@@ -6,9 +6,9 @@
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.objects.properties.Property;
 import net.aufdemrand.denizencore.tags.Attribute;
-import net.minecraft.server.v1_9_R1.ItemStack;
-import net.minecraft.server.v1_9_R1.NBTTagCompound;
-import org.bukkit.craftbukkit.v1_9_R1.inventory.CraftItemStack;
+import net.minecraft.server.v1_9_R2.ItemStack;
+import net.minecraft.server.v1_9_R2.NBTTagCompound;
+import org.bukkit.craftbukkit.v1_9_R2.inventory.CraftItemStack;
 
 public class ItemUnbreakable implements Property {
 

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/item/FakeItemCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/item/FakeItemCommand.java
@@ -14,10 +14,10 @@
 import net.aufdemrand.denizencore.scripts.ScriptEntry;
 import net.aufdemrand.denizencore.scripts.commands.AbstractCommand;
 import net.aufdemrand.denizencore.utilities.scheduling.OneTimeSchedulable;
-import net.minecraft.server.v1_9_R1.ItemStack;
-import net.minecraft.server.v1_9_R1.PacketPlayOutSetSlot;
-import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_9_R1.inventory.CraftItemStack;
+import net.minecraft.server.v1_9_R2.ItemStack;
+import net.minecraft.server.v1_9_R2.PacketPlayOutSetSlot;
+import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_9_R2.inventory.CraftItemStack;
 
 import java.util.Arrays;
 import java.util.List;
@@ -97,7 +97,7 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
                 continue;
             }
 
-            net.minecraft.server.v1_9_R1.ItemStack itemStack = CraftItemStack.asNMSCopy(item.getItemStack());
+            net.minecraft.server.v1_9_R2.ItemStack itemStack = CraftItemStack.asNMSCopy(item.getItemStack());
 
             for (dPlayer player : players) {
                 setSlot((CraftPlayer) player.getPlayerEntity(), slot, itemStack, player_only.asBoolean());

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/player/BlockCrack.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/player/BlockCrack.java
@@ -12,8 +12,8 @@
 import net.aufdemrand.denizencore.objects.dList;
 import net.aufdemrand.denizencore.scripts.ScriptEntry;
 import net.aufdemrand.denizencore.scripts.commands.AbstractCommand;
-import net.minecraft.server.v1_9_R1.BlockPosition;
-import net.minecraft.server.v1_9_R1.PacketPlayOutBlockBreakAnimation;
+import net.minecraft.server.v1_9_R2.BlockPosition;
+import net.minecraft.server.v1_9_R2.PacketPlayOutBlockBreakAnimation;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/player/SidebarCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/player/SidebarCommand.java
@@ -15,7 +15,7 @@
 import net.aufdemrand.denizencore.scripts.commands.AbstractCommand;
 import net.aufdemrand.denizencore.tags.TagContext;
 import net.aufdemrand.denizencore.tags.TagManager;
-import net.minecraft.server.v1_9_R1.*;
+import net.minecraft.server.v1_9_R2.*;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/server/ExecuteCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/server/ExecuteCommand.java
@@ -13,12 +13,12 @@
 import net.aufdemrand.denizencore.scripts.ScriptEntry;
 import net.aufdemrand.denizencore.scripts.commands.AbstractCommand;
 import net.aufdemrand.denizencore.utilities.CoreUtilities;
-import net.minecraft.server.v1_9_R1.MinecraftServer;
-import net.minecraft.server.v1_9_R1.OpList;
-import net.minecraft.server.v1_9_R1.OpListEntry;
-import net.minecraft.server.v1_9_R1.PlayerList;
+import net.minecraft.server.v1_9_R2.MinecraftServer;
+import net.minecraft.server.v1_9_R2.OpList;
+import net.minecraft.server.v1_9_R2.OpListEntry;
+import net.minecraft.server.v1_9_R2.PlayerList;
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/world/AnimateChestCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/world/AnimateChestCommand.java
@@ -11,12 +11,12 @@
 import net.aufdemrand.denizencore.objects.dList;
 import net.aufdemrand.denizencore.scripts.ScriptEntry;
 import net.aufdemrand.denizencore.scripts.commands.AbstractCommand;
-import net.minecraft.server.v1_9_R1.Block;
-import net.minecraft.server.v1_9_R1.BlockPosition;
-import net.minecraft.server.v1_9_R1.PacketPlayOutBlockAction;
+import net.minecraft.server.v1_9_R2.Block;
+import net.minecraft.server.v1_9_R2.BlockPosition;
+import net.minecraft.server.v1_9_R2.PacketPlayOutBlockAction;
 import org.bukkit.Sound;
-import org.bukkit.craftbukkit.v1_9_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_9_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer;
 
 import java.util.Arrays;
 import java.util.List;

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/world/ModifyBlockCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/world/ModifyBlockCommand.java
@@ -19,7 +19,7 @@
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_9_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_9_R2.CraftWorld;
 import org.bukkit.entity.EntityType;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/world/PlayEffectCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/world/PlayEffectCommand.java
@@ -12,11 +12,11 @@
 import net.aufdemrand.denizencore.scripts.ScriptEntry;
 import net.aufdemrand.denizencore.scripts.commands.AbstractCommand;
 import net.aufdemrand.denizencore.utilities.CoreUtilities;
-import net.minecraft.server.v1_9_R1.EnumParticle;
-import net.minecraft.server.v1_9_R1.PacketPlayOutWorldParticles;
+import net.minecraft.server.v1_9_R2.EnumParticle;
+import net.minecraft.server.v1_9_R2.PacketPlayOutWorldParticles;
 import org.bukkit.Effect;
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;