From b889c2763073967ff6994661115414e2a7cbf41b Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Fri, 5 Dec 2014 22:28:08 -0600
Subject: [PATCH] Clean up some of our patches

Remove unused torch placement config option
Remove ambiguity in invisible players patch
---
 .../Configurable-TNT-water-movement.patch                 | 6 ++----
 .../Configurable-game-mechanics-changes.patch             | 2 --
 ...hts.patch => Vanished-players-don-t-have-rights.patch} | 8 ++++----
 3 files changed, 6 insertions(+), 10 deletions(-)
 rename Spigot-Server-Patches/{Invisible-players-don-t-have-rights.patch => Vanished-players-don-t-have-rights.patch} (95%)

diff --git a/Spigot-Server-Patches/Configurable-TNT-water-movement.patch b/Spigot-Server-Patches/Configurable-TNT-water-movement.patch
index 1d1db34ee..4007b2d0b 100644
--- a/Spigot-Server-Patches/Configurable-TNT-water-movement.patch
+++ b/Spigot-Server-Patches/Configurable-TNT-water-movement.patch
@@ -26,8 +26,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperSpigotWorldConfig
+     {
          boatsDropBoats = getBoolean( "game-mechanics.boats-drop-boats", false );
-         lessPickyTorches = getBoolean( "game-mechanics.less-picky-torch-placement", false );
      }
 +
 +    public boolean tntMovesInWater;
@@ -36,6 +36,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        tntMovesInWater = getBoolean("tnt-moves-in-water", true );
 +    }
  }
--- 
-1.9.4.msysgit.2
-
+--
\ No newline at end of file
diff --git a/Spigot-Server-Patches/Configurable-game-mechanics-changes.patch b/Spigot-Server-Patches/Configurable-game-mechanics-changes.patch
index 8f6180627..d159f424e 100644
--- a/Spigot-Server-Patches/Configurable-game-mechanics-changes.patch
+++ b/Spigot-Server-Patches/Configurable-game-mechanics-changes.patch
@@ -72,11 +72,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
 +
 +    public boolean boatsDropBoats;
-+    public boolean lessPickyTorches;
 +    private void mechanicsChanges()
 +    {
 +        boatsDropBoats = getBoolean( "game-mechanics.boats-drop-boats", false );
-+        lessPickyTorches = getBoolean( "game-mechanics.less-picky-torch-placement", false );
 +    }
  }
 --
\ No newline at end of file
diff --git a/Spigot-Server-Patches/Invisible-players-don-t-have-rights.patch b/Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch
similarity index 95%
rename from Spigot-Server-Patches/Invisible-players-don-t-have-rights.patch
rename to Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch
index 97b92723a..210e2223d 100644
--- a/Spigot-Server-Patches/Invisible-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Zach Brown <1254957+zachbr@users.noreply.github.com>
 Date: Fri, 28 Nov 2014 00:35:56 -0600
-Subject: [PATCH] Invisible players don't have rights
+Subject: [PATCH] Vanished players don't have rights
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -12,7 +12,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              float f3;
              float f4;
  
-+            // PaperSpigot start - Allow arrows to fly through players
++            // PaperSpigot start - Allow arrows to fly through vanished players the shooter can't see
 +            if (movingobjectposition != null && movingobjectposition.entity instanceof EntityPlayer && shooter != null && shooter instanceof EntityPlayer) {
 +                if (!((EntityPlayer) shooter).getBukkitEntity().canSee(((EntityPlayer) movingobjectposition.entity).getBukkitEntity())) {
 +                    movingobjectposition = null;
@@ -31,7 +31,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              }
          }
  
-+        // PaperSpigot start - Allow projectiles to fly through players the shooter can't see
++        // PaperSpigot start - Allow projectiles to fly through vanished players the shooter can't see
 +        if (movingobjectposition != null && movingobjectposition.entity instanceof EntityPlayer && shooter != null && shooter instanceof EntityPlayer) {
 +            if (!((EntityPlayer) shooter).getBukkitEntity().canSee(((EntityPlayer) movingobjectposition.entity).getBukkitEntity())) {
 +                movingobjectposition = null;
@@ -50,7 +50,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          for (int i = 0; i < list.size(); ++i) {
              Entity entity1 = (Entity) list.get(i);
  
-+            // PaperSpigot start - Allow block placement if the placer cannot see the blocker
++            // PaperSpigot start - Allow block placement if the placer cannot see the vanished blocker
 +            if (entity instanceof EntityPlayer && entity1 instanceof EntityPlayer) {
 +                if (!((EntityPlayer) entity).getBukkitEntity().canSee(((EntityPlayer) entity1).getBukkitEntity())) {
 +                    continue;