From 8c91a223221f72daf83015e6a9d0875f0826c102 Mon Sep 17 00:00:00 2001
From: CoolJWB <berghwilliam@gmail.com>
Date: Sun, 3 Nov 2019 16:42:23 +0100
Subject: [PATCH] Commit v1.2

Resolved 1.13 API version issue.
Changed mode inverval.
---
 .idea/modules/VulnerabilityPatcher.main.iml           |  2 +-
 .idea/modules/VulnerabilityPatcher.test.iml           |  2 +-
 ...ljwb.vulnerabilitypatcher.VulnerabilityPatcher.iml |  2 +-
 .idea/workspace.xml                                   | 11 +++--------
 gradle.properties                                     |  2 +-
 .../vulnerabilitypatcher/VulnerabilityPatcher.java    |  4 ++--
 .../vulnerabilitypatcher/commands/CommandGetLag.java  |  2 ++
 .../vulnerabilitypatcher/patches/Death_Items.java     |  8 ++++----
 .../patches/Disconnect_Items.java                     |  5 ++---
 .../vulnerabilitypatcher/patches/Fireworks.java       |  3 ++-
 .../cooljwb/vulnerabilitypatcher/patches/Spawner.java |  3 ++-
 src/main/resources/plugin.yml                         |  4 ++--
 12 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/.idea/modules/VulnerabilityPatcher.main.iml b/.idea/modules/VulnerabilityPatcher.main.iml
index aea79a2..6ed4906 100644
--- a/.idea/modules/VulnerabilityPatcher.main.iml
+++ b/.idea/modules/VulnerabilityPatcher.main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="VulnerabilityPatcher:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="me.cooljwb.vulnerabilitypatcher" external.system.module.type="sourceSet" external.system.module.version="v1.1" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="VulnerabilityPatcher:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="me.cooljwb.vulnerabilitypatcher" external.system.module.type="sourceSet" external.system.module.version="v1.2" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="minecraft" name="Minecraft">
       <configuration>
diff --git a/.idea/modules/VulnerabilityPatcher.test.iml b/.idea/modules/VulnerabilityPatcher.test.iml
index 062b846..337159a 100644
--- a/.idea/modules/VulnerabilityPatcher.test.iml
+++ b/.idea/modules/VulnerabilityPatcher.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="VulnerabilityPatcher:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="me.cooljwb.vulnerabilitypatcher" external.system.module.type="sourceSet" external.system.module.version="v1.1" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="VulnerabilityPatcher:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="me.cooljwb.vulnerabilitypatcher" external.system.module.type="sourceSet" external.system.module.version="v1.2" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="minecraft" name="Minecraft">
       <configuration>
diff --git a/.idea/modules/me.cooljwb.vulnerabilitypatcher.VulnerabilityPatcher.iml b/.idea/modules/me.cooljwb.vulnerabilitypatcher.VulnerabilityPatcher.iml
index b50bb86..fcf46ca 100644
--- a/.idea/modules/me.cooljwb.vulnerabilitypatcher.VulnerabilityPatcher.iml
+++ b/.idea/modules/me.cooljwb.vulnerabilitypatcher.VulnerabilityPatcher.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="VulnerabilityPatcher" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="me.cooljwb.vulnerabilitypatcher" external.system.module.version="v1.1" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="VulnerabilityPatcher" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="me.cooljwb.vulnerabilitypatcher" external.system.module.version="v1.2" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5ccd850..5e7413f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,22 +2,17 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="4038a6e9-7d52-4dd0-91ef-d9a12aa1c1b2" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/events/DisconnectionAid.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/modules/VulnerabilityPatcher.main.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/VulnerabilityPatcher.main.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/modules/VulnerabilityPatcher.test.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/VulnerabilityPatcher.test.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/modules/me.cooljwb.vulnerabilitypatcher.VulnerabilityPatcher.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/me.cooljwb.vulnerabilitypatcher.VulnerabilityPatcher.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/gradle.properties" beforeDir="false" afterPath="$PROJECT_DIR$/gradle.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/VulnerabilityPatcher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/VulnerabilityPatcher.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/modifiers/NBTModifier.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/modifiers/NBTModifier.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/modifiers/NBTModifier_1_13.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Chunks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Chunks.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/commands/CommandGetLag.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/commands/CommandGetLag.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Death_Items.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Death_Items.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Disconnect_Items.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Disconnect_Items.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Item_Frames.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Item_Frames.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Patches.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Patches.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Fireworks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Fireworks.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Spawner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Spawner.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/config.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/config.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/plugin.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/plugin.yml" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
diff --git a/gradle.properties b/gradle.properties
index d132e30..11d5e22 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
 pluginGroup=me.cooljwb.vulnerabilitypatcher
-pluginVersion=v1.1
\ No newline at end of file
+pluginVersion=v1.2
\ No newline at end of file
diff --git a/src/main/java/me/cooljwb/vulnerabilitypatcher/VulnerabilityPatcher.java b/src/main/java/me/cooljwb/vulnerabilitypatcher/VulnerabilityPatcher.java
index ca9ba63..a2ac57f 100644
--- a/src/main/java/me/cooljwb/vulnerabilitypatcher/VulnerabilityPatcher.java
+++ b/src/main/java/me/cooljwb/vulnerabilitypatcher/VulnerabilityPatcher.java
@@ -72,8 +72,8 @@ public final class VulnerabilityPatcher extends JavaPlugin {
 
             Bukkit.getServer().getPluginCommand(CommandVulnerabilityPatcher.vulnerabilitypatcher).setExecutor(commandvulnerabilitypatcher);
             Bukkit.getServer().getPluginCommand(CommandGetNBT.getnbt).setExecutor(commandgetnbt);
-            Bukkit.getPluginManager().registerEvents(new DisconnectionAid(), this);
-            //Bukkit.getServer().getPluginCommand(CommandGetLag.getlag).setExecutor(commandgetlag);
+            //Bukkit.getPluginManager().registerEvents(new DisconnectionAid(), this); In-dev feature.
+            //Bukkit.getServer().getPluginCommand(CommandGetLag.getlag).setExecutor(commandgetlag); In-dev command.
 
             hand_switch.runnable();
 
diff --git a/src/main/java/me/cooljwb/vulnerabilitypatcher/commands/CommandGetLag.java b/src/main/java/me/cooljwb/vulnerabilitypatcher/commands/CommandGetLag.java
index ec8e502..67bb148 100644
--- a/src/main/java/me/cooljwb/vulnerabilitypatcher/commands/CommandGetLag.java
+++ b/src/main/java/me/cooljwb/vulnerabilitypatcher/commands/CommandGetLag.java
@@ -15,6 +15,8 @@ import java.util.Map;
 
 public class CommandGetLag extends Patches implements CommandExecutor {
 
+    // In-dev command.
+
     public static String getlag = "getlag";
 
     @Override
diff --git a/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Death_Items.java b/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Death_Items.java
index afa4702..41d64e4 100644
--- a/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Death_Items.java
+++ b/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Death_Items.java
@@ -42,7 +42,7 @@ public class Death_Items extends Patches implements Listener {
     /* When a dispenser dispenses a death item cancel the event and null the item. */
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onBlockDispenseEvent(BlockDispenseEvent event) {
-        if((containsDeathItem(event.getItem()) && mode >= 1)) {
+        if(containsDeathItem(event.getItem())) {
             event.setCancelled(true);
             Container container = (Container) event.getBlock().getState();
 
@@ -67,7 +67,7 @@ public class Death_Items extends Patches implements Listener {
 
             boolean violation = false;
             for(ItemStack item : container.getInventory()) {
-                if(isDeathItem(item) || (containsDeathItem(item) && mode >= 1)) {
+                if(isDeathItem(item) || containsDeathItem(item)) {
                     container.getInventory().remove(item);
                     violation = true;
                 }
@@ -86,7 +86,7 @@ public class Death_Items extends Patches implements Listener {
     /* When an item is clicked on check if it's a death item and if so null it. */
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onInventoryClickEvent(InventoryClickEvent event) {
-        if(isDeathItem(event.getCursor()) || (containsDeathItem(event.getCursor()) && mode >= 1)) {
+        if(isDeathItem(event.getCursor()) || containsDeathItem(event.getCursor())) {
             Player player = null;
             if(event.getWhoClicked() instanceof Player) {
                 player = Bukkit.getPlayer(event.getWhoClicked().getUniqueId());
@@ -115,7 +115,7 @@ public class Death_Items extends Patches implements Listener {
     public void onPlayerDropEvent(PlayerDropItemEvent event) {
         ItemStack item = event.getItemDrop().getItemStack();
 
-        if(isDeathItem(item) || (containsDeathItem(item) && mode >= 1)) {
+        if(isDeathItem(item) || containsDeathItem(item)) {
             event.setCancelled(true);
             clearItemMeta(event.getItemDrop().getItemStack());
 
diff --git a/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Disconnect_Items.java b/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Disconnect_Items.java
index 3af9502..5aeae30 100644
--- a/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Disconnect_Items.java
+++ b/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Disconnect_Items.java
@@ -87,10 +87,9 @@ public class Disconnect_Items extends Patches implements Listener {
 
             boolean violation = false;
             for(ItemStack item : container.getInventory()) {
-                if(isDisconnectItem(item) || (containsDisconnectItem(item) && mode >= 1)) {
+                if(isDisconnectItem(item) || containsDisconnectItem(item)) {
                     container.getInventory().remove(item);
-                    if(mode >= 1)
-                        event.setCancelled(true);
+                    event.setCancelled(true);
                     violation = true;
                 }
             }
diff --git a/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Fireworks.java b/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Fireworks.java
index 0dbda95..2f832da 100644
--- a/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Fireworks.java
+++ b/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Fireworks.java
@@ -2,6 +2,7 @@ package me.cooljwb.vulnerabilitypatcher.patches;
 
 import org.bukkit.entity.Firework;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntitySpawnEvent;
 
 /*
@@ -24,7 +25,7 @@ import org.bukkit.event.entity.EntitySpawnEvent;
  * @author CoolJWB
  */
 
-public class Fireworks extends Patches {
+public class Fireworks extends Patches implements Listener {
 
     @EventHandler
     public void onEntitySpawnEvent(EntitySpawnEvent event) {
diff --git a/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Spawner.java b/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Spawner.java
index 6506747..016837d 100644
--- a/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Spawner.java
+++ b/src/main/java/me/cooljwb/vulnerabilitypatcher/patches/Spawner.java
@@ -3,6 +3,7 @@ package me.cooljwb.vulnerabilitypatcher.patches;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockPlaceEvent;
 
 /*
@@ -25,7 +26,7 @@ import org.bukkit.event.block.BlockPlaceEvent;
  * @author CoolJWB
  */
 
-public class Spawner extends Patches {
+public class Spawner extends Patches implements Listener {
 
     @EventHandler
     public void onBlockPlaceEvent(BlockPlaceEvent event) {
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 2db0feb..128f089 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,7 +1,7 @@
 name: VulnerabilityPatcher
-version: 1.1
+version: "1.2"
 main: me.cooljwb.vulnerabilitypatcher.VulnerabilityPatcher
-api-version: 1.14
+api-version: "1.13"
 authors: [CoolJWB]
 description: Patches vurnelabilities that cause server instabilaty.
 commands: