From 09cba5cc32592e94b0b35c51379fd57382550f63 Mon Sep 17 00:00:00 2001
From: Daniel Saukel <sa.da@unitybox.de>
Date: Tue, 14 Jul 2015 18:27:46 +0200
Subject: [PATCH] Update to 1.8.7

---
 plugin.yml                                           |  9 ---------
 src/com/dre/dungeonsxl/P.java                        | 12 ++++++------
 src/com/dre/dungeonsxl/commands/CMDDeletePortal.java |  6 +++++-
 src/plugin.yml                                       | 11 +++++++++++
 4 files changed, 22 insertions(+), 16 deletions(-)
 delete mode 100644 plugin.yml
 create mode 100644 src/plugin.yml

diff --git a/plugin.yml b/plugin.yml
deleted file mode 100644
index 66329155..00000000
--- a/plugin.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-name: DungeonsXL
-version: 0.8.2
-main: com.dre.dungeonsxl.P
-authors: [Frank Baumann]
-softdepend: [Vault]
-commands:
-  dungeonsxl:
-    description: Reference command for DungeonsXL.
-    aliases: [dxl,dungeon]
diff --git a/src/com/dre/dungeonsxl/P.java b/src/com/dre/dungeonsxl/P.java
index 2dc25fdb..9a725ab2 100644
--- a/src/com/dre/dungeonsxl/P.java
+++ b/src/com/dre/dungeonsxl/P.java
@@ -11,11 +11,11 @@ import java.util.UUID;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import net.milkbowl.vault.permission.Permission;
-import net.minecraft.server.v1_8_R1.EntityPlayer;
-import net.minecraft.server.v1_8_R1.MinecraftServer;
-import net.minecraft.server.v1_8_R1.PlayerInteractManager;
-import com.mojang.authlib.GameProfile;
+import net.minecraft.server.v1_8_R3.EntityPlayer;
+import net.minecraft.server.v1_8_R3.MinecraftServer;
+import net.minecraft.server.v1_8_R3.PlayerInteractManager;
 
+import com.mojang.authlib.GameProfile;
 
 import org.apache.commons.lang.math.NumberUtils;
 import org.bukkit.Bukkit;
@@ -24,8 +24,8 @@ import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.craftbukkit.v1_8_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_8_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_8_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_8_R3.CraftWorld;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
diff --git a/src/com/dre/dungeonsxl/commands/CMDDeletePortal.java b/src/com/dre/dungeonsxl/commands/CMDDeletePortal.java
index 0b17b2b2..4b0b5c40 100644
--- a/src/com/dre/dungeonsxl/commands/CMDDeletePortal.java
+++ b/src/com/dre/dungeonsxl/commands/CMDDeletePortal.java
@@ -1,7 +1,11 @@
 package com.dre.dungeonsxl.commands;
 
+import java.util.Set;
+
+import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+
 import com.dre.dungeonsxl.DPortal;
 
 public class CMDDeletePortal extends DCommand {
@@ -17,7 +21,7 @@ public class CMDDeletePortal extends DCommand {
 	@Override
 	public void onExecute(String[] args, CommandSender sender) {
 		Player player = (Player) sender;
-		DPortal dPortal = DPortal.get(player.getTargetBlock(null, 20).getLocation());
+		DPortal dPortal = DPortal.get(player.getTargetBlock((Set<Material>) null, 20).getLocation());
 
 		if (dPortal != null) {
 			dPortal.delete();
diff --git a/src/plugin.yml b/src/plugin.yml
new file mode 100644
index 00000000..787fcc55
--- /dev/null
+++ b/src/plugin.yml
@@ -0,0 +1,11 @@
+name: DungeonsXL
+main: com.dre.dungeonsxl.P
+version: 0.8.3
+author: Frank Baumann
+authors: [Frank Baumann, Milan Albrecht, Tobias Schmitz, Daniel Saukel]
+website: http://www.dre2n.ml
+softdepend: [Vault, SpoutcraftPlugin]
+commands:
+  dungeonsxl:
+    description: Reference command for DungeonsXL.
+    aliases: [dxl,dungeon]