Clean up some of our patches

Remove unused torch placement config option
Remove ambiguity in invisible players patch

Spigot-Server-Patches/0006-Vanished-players-don-t-have-rights.patch

@@ -1,18 +1,18 @@
-From 098854a34a9672de8cb33272a407aaca282940f9 Mon Sep 17 00:00:00 2001
+From e2925f8aaa6f2597fdea35baa1a7c2de9db2598c Mon Sep 17 00:00:00 2001
 From: Zach Brown <Zbob750@live.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
-index 7d1727d..d1c588a 100644
+index 7d1727d..1d8b138 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -221,6 +221,14 @@ public class EntityArrow extends Entity implements IProjectile {
              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;
@@ -24,14 +24,14 @@ index 7d1727d..d1c588a 100644
                  org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this); // CraftBukkit - Call event
                  
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index ce3e628..7fc9abe 100644
+index ce3e628..005e995 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -146,6 +146,14 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
              }
          }
  
-+        // 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;
@@ -43,14 +43,14 @@ index ce3e628..7fc9abe 100644
              if (movingobjectposition.type == EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.a()).getBlock() == Blocks.PORTAL) {
                  this.aq();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 344642c..dd3acde 100644
+index 7a41398..1b895e3 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1654,6 +1654,14 @@ public abstract class World implements IBlockAccess {
          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;

Spigot-Server-Patches/0037-Configurable-game-mechanics-changes.patch

@@ -1,4 +1,4 @@
-From de36e75aad08943806c34e51120a9ce87e0e9b29 Mon Sep 17 00:00:00 2001
+From 1047923869dc8cfbb3ae4663d55032aadb53e932 Mon Sep 17 00:00:00 2001
 From: gsand <gsandowns@gmail.com>
 Date: Fri, 28 Nov 2014 13:53:48 -0600
 Subject: [PATCH] Configurable game mechanics changes
@@ -63,20 +63,18 @@ index dc4f526..45b5ac5 100644
 +    }
  }
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 9507ab5..f7a256d 100644
+index 9507ab5..7f02e29 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -180,4 +180,12 @@ public class PaperSpigotWorldConfig
+@@ -180,4 +180,10 @@ public class PaperSpigotWorldConfig
          removeUnloadedTNTEntities = getBoolean( "remove-unloaded.tnt-entities", true );
          removeUnloadedFallingBlocks = getBoolean( "remove-unloaded.falling-blocks", true );
      }
 +
 +    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 );
 +    }
  }
 -- 

Spigot-Server-Patches/0039-Configurable-TNT-water-movement.patch

@@ -1,4 +1,4 @@
-From 1220cadf01b0eb0a6d11fe8b3a39c129e319c712 Mon Sep 17 00:00:00 2001
+From 26fd68239de5e9c930d7f0e5ebbbc4e7a0c473f9 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Sat, 29 Nov 2014 23:05:52 -0800
 Subject: [PATCH] Configurable TNT water movement
@@ -22,12 +22,12 @@ index 7b856ef..b5763bb 100644
 +    }
  }
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index f7a256d..2aab21b 100644
+index 7f02e29..74d1017 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -188,4 +188,10 @@ public class PaperSpigotWorldConfig
+@@ -186,4 +186,10 @@ public class PaperSpigotWorldConfig
+     {
          boatsDropBoats = getBoolean( "game-mechanics.boats-drop-boats", false );
-         lessPickyTorches = getBoolean( "game-mechanics.less-picky-torch-placement", false );
      }
 +
 +    public boolean tntMovesInWater;
@@ -37,5 +37,5 @@ index f7a256d..2aab21b 100644
 +    }
  }
 -- 
-1.9.4.msysgit.2
+1.9.1