From 980c78afdff48cab1ae732a4deec8c0029bd5387 Mon Sep 17 00:00:00 2001
From: Ste3et_C0st <ste3et@dicecraft.de>
Date: Sun, 20 Jan 2019 15:25:25 +0100
Subject: [PATCH] Fix Flower Pot

---
 .externalToolBuilders/DiceFurniture.launch           | 12 ------------
 .project                                             | 10 ----------
 .../Furniture/Objects/garden/TFlowerPot.java         |  3 ++-
 src/plugin.yml                                       |  2 +-
 4 files changed, 3 insertions(+), 24 deletions(-)
 delete mode 100644 .externalToolBuilders/DiceFurniture.launch

diff --git a/.externalToolBuilders/DiceFurniture.launch b/.externalToolBuilders/DiceFurniture.launch
deleted file mode 100644
index fb3cea0..0000000
--- a/.externalToolBuilders/DiceFurniture.launch
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="DiceFurniture1.13"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/DiceFurniture1.13/builder.xml}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-</launchConfiguration>
diff --git a/.project b/.project
index 7336a8f..3ba5be7 100644
--- a/.project
+++ b/.project
@@ -10,16 +10,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>auto,full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/DiceFurniture.launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
diff --git a/src/de/Ste3et_C0st/Furniture/Objects/garden/TFlowerPot.java b/src/de/Ste3et_C0st/Furniture/Objects/garden/TFlowerPot.java
index ca1a59f..b695496 100644
--- a/src/de/Ste3et_C0st/Furniture/Objects/garden/TFlowerPot.java
+++ b/src/de/Ste3et_C0st/Furniture/Objects/garden/TFlowerPot.java
@@ -7,6 +7,7 @@ import java.util.List;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.Tag;
 import org.bukkit.block.Block;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -38,7 +39,7 @@ public class TFlowerPot extends Furniture implements Listener {
 	
 	private void setPotState(){
 		pot=getLocation().getBlock();
-		if(pot.getType()==null||!pot.getType().equals(Material.FLOWER_POT)){pot.setType(Material.FLOWER_POT);}
+		if(pot.getType()==null||!Tag.FLOWER_POTS.isTagged(pot.getType())){pot.setType(Material.FLOWER_POT);}
 		getObjID().addBlock(Arrays.asList(pot));
 	}
 
diff --git a/src/plugin.yml b/src/plugin.yml
index da1d49f..98b49f4 100644
--- a/src/plugin.yml
+++ b/src/plugin.yml
@@ -1,5 +1,5 @@
 name: DiceFurniture
-version: 3.3.0.1
+version: 3.3.0.2
 description: Add some new Objects to the Server
 author: Ste3et_C0st
 website: http://dicecraft.de