Drop redundant patch and fixup command logging

patches/server/0021-Make-scoreboard-classes-public.patch → patches/server/0020-Make-scoreboard-classes-public.patch

@@ -1,11 +1,11 @@
-From 03167cfb95e34b48a6f3efb70734c7bba4b085a7 Mon Sep 17 00:00:00 2001
+From 57cead3697a5985aeb24299ad9284d492d908f01 Mon Sep 17 00:00:00 2001
 From: cswhite2000 <18whitechristop@gmail.com>
 Date: Sat, 4 Aug 2018 21:54:22 -0700
 Subject: [PATCH] Make scoreboard classes public
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java
-index 7dedd0222..5a7c60c2d 100644
+index 7dedd022..5a7c60c2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java
 @@ -7,7 +7,7 @@ import net.minecraft.server.ScoreboardObjective;
@@ -18,7 +18,7 @@ index 7dedd0222..5a7c60c2d 100644
      static final CraftCriteria DUMMY;
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java
-index 5bd8cf9d7..18f515b8e 100644
+index 5bd8cf9d..18f515b8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java
 @@ -9,7 +9,7 @@ import org.bukkit.scoreboard.DisplaySlot;
@@ -40,7 +40,7 @@ index 5bd8cf9d7..18f515b8e 100644
      }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
-index ee9d2aedd..b10201d83 100644
+index ee9d2aed..b10201d8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
 @@ -17,7 +17,7 @@ import org.bukkit.scoreboard.Score;
@@ -53,7 +53,7 @@ index ee9d2aedd..b10201d83 100644
      private final CraftObjective objective;
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardComponent.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardComponent.java
-index d26d09d41..43b72ecf6 100644
+index d26d09d4..43b72ecf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardComponent.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardComponent.java
 @@ -1,6 +1,6 @@
@@ -65,7 +65,7 @@ index d26d09d41..43b72ecf6 100644
 
      CraftScoreboardComponent(CraftScoreboard scoreboard) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardTranslations.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardTranslations.java
-index d08e5a281..4a305bb16 100644
+index d08e5a28..4a305bb1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardTranslations.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardTranslations.java
 @@ -6,7 +6,7 @@ import org.bukkit.scoreboard.DisplaySlot;
@@ -78,7 +78,7 @@ index d08e5a281..4a305bb16 100644
      static ImmutableBiMap<DisplaySlot, String> SLOTS = ImmutableBiMap.of(
              DisplaySlot.BELOW_NAME, "belowName",
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-index f5ff0f712..54e9ea1dc 100644
+index f5ff0f71..54e9ea1d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
 @@ -13,7 +13,7 @@ import com.google.common.collect.ImmutableSet;
@@ -91,5 +91,5 @@ index f5ff0f712..54e9ea1dc 100644
 
      CraftTeam(CraftScoreboard scoreboard, ScoreboardTeam team) {
 -- 
-2.18.0
+2.51.0
 

patches/server/0022-Add-EntityDespawnInVoidEvent.patch → patches/server/0021-Add-EntityDespawnInVoidEvent.patch

@@ -1,11 +1,11 @@
-From 36eecfe0559faa1da6c66d190d9fc859d8d49335 Mon Sep 17 00:00:00 2001
+From 35951e9a61c5db2d390e53c93cadebb720d053b2 Mon Sep 17 00:00:00 2001
 From: cswhite2000 <18whitechristop@gmail.com>
 Date: Sat, 4 Aug 2018 22:00:27 -0700
 Subject: [PATCH] Add EntityDespawnInVoidEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2da303fee..9746cafda 100644
+index 2da303fe..9746cafd 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -19,6 +19,7 @@ import org.bukkit.entity.Vehicle;
@@ -27,5 +27,5 @@ index 2da303fee..9746cafda 100644
      }
 
 -- 
-2.18.0
+2.51.0
 

patches/server/0023-Fix-BlockFromToEvents-firing-when-flow-is-obstructed.patch → patches/server/0022-Fix-BlockFromToEvents-firing-when-flow-is-obstructed.patch

@@ -1,11 +1,11 @@
-From 2ed6b3bf21f58696a111669396fbe05223049e6b Mon Sep 17 00:00:00 2001
+From b867039ab8e0a5d113e555924e698218a5aabf9a Mon Sep 17 00:00:00 2001
 From: cswhite2000 <18whitechristop@gmail.com>
 Date: Sun, 5 Aug 2018 02:08:01 -0700
 Subject: [PATCH] Fix BlockFromToEvents firing when flow is obstructed
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
-index 23130ba96..b1168dfef 100644
+index 23130ba9..b1168dfe 100644
 --- a/src/main/java/net/minecraft/server/BlockFlowing.java
 +++ b/src/main/java/net/minecraft/server/BlockFlowing.java
 @@ -143,13 +143,15 @@ public class BlockFlowing extends BlockFluids {
@@ -31,5 +31,5 @@ index 23130ba96..b1168dfef 100644
                  // CraftBukkit end
              }
 -- 
-2.18.0
+2.51.0
 

patches/server/0024-Fix-wrong-potion-particles-after-respawn.patch → patches/server/0023-Fix-wrong-potion-particles-after-respawn.patch

@@ -1,11 +1,11 @@
-From 5111fcbed25e914f450e2735a289ba36255c9123 Mon Sep 17 00:00:00 2001
+From 0aad2988f95b58290a4599a3c3ff2888715c0efb Mon Sep 17 00:00:00 2001
 From: cswhite2000 <18whitechristop@gmail.com>
 Date: Sun, 5 Aug 2018 02:14:51 -0700
 Subject: [PATCH] Fix wrong potion particles after respawn
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 593a12dca..35ba2e718 100644
+index 593a12dc..35ba2e71 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1201,6 +1201,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -25,5 +25,5 @@ index 593a12dca..35ba2e718 100644
          this.killer = null;
          this.lastDamager = null;
 -- 
-2.18.0
+2.51.0
 

patches/server/0025-Add-API-to-disable-potion-particles.patch → patches/server/0024-Add-API-to-disable-potion-particles.patch

@@ -1,11 +1,11 @@
-From e69c1b27aa8b1c29092a70cfdb5938446e989644 Mon Sep 17 00:00:00 2001
+From 2db6f7346565723234661ddb214ec1658a7d60cf Mon Sep 17 00:00:00 2001
 From: cswhite2000 <18whitechristop@gmail.com>
 Date: Sun, 5 Aug 2018 02:19:32 -0700
 Subject: [PATCH] Add API to disable potion particles
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index c8b4e2928..1c3677a46 100644
+index c8b4e292..1c3677a4 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -14,6 +14,7 @@ import java.util.UUID;
@@ -37,7 +37,7 @@ index c8b4e2928..1c3677a46 100644
          }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 0b033fd12..5f544d82f 100644
+index 0b033fd1..5f544d82 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -65,6 +65,7 @@ import org.bukkit.util.Vector;
@@ -71,5 +71,5 @@ index 0b033fd12..5f544d82f 100644
          return launchProjectile(projectile, null);
      }
 -- 
-2.18.0
+2.51.0
 

patches/server/0026-Fix-spurious-bucket-empty-events.patch → patches/server/0025-Fix-spurious-bucket-empty-events.patch

@@ -1,11 +1,11 @@
-From d832fa0dd561f7f8ca88abf21e9974d3deb00dc8 Mon Sep 17 00:00:00 2001
+From 7abcefd5a672822c2059accbda72302a9f188386 Mon Sep 17 00:00:00 2001
 From: cswhite2000 <18whitechristop@gmail.com>
 Date: Sun, 5 Aug 2018 14:58:17 -0700
 Subject: [PATCH] Fix spurious bucket empty events
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java
-index b62ea42fc..f3bdce536 100644
+index b62ea42f..f3bdce53 100644
 --- a/src/main/java/net/minecraft/server/ItemBucket.java
 +++ b/src/main/java/net/minecraft/server/ItemBucket.java
 @@ -86,29 +86,33 @@ public class ItemBucket extends Item {
@@ -62,5 +62,5 @@ index b62ea42fc..f3bdce536 100644
              }
 
 -- 
-2.18.0
+2.51.0
 

patches/server/0027-Fix-head-rotation-packet-spam.patch → patches/server/0026-Fix-head-rotation-packet-spam.patch

@@ -1,11 +1,11 @@
-From 6b20e46a21deca0711c21528c472f144ee60d593 Mon Sep 17 00:00:00 2001
+From dbc087ad70bcefa394ffbb4ce229282893900eae Mon Sep 17 00:00:00 2001
 From: cswhite2000 <18whitechristop@gmail.com>
 Date: Sun, 5 Aug 2018 15:00:46 -0700
 Subject: [PATCH] Fix head rotation packet spam
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 1fc2388ea..12112ce7a 100644
+index 1fc2388e..12112ce7 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -411,8 +411,10 @@ public class EntityTrackerEntry {
@@ -22,5 +22,5 @@ index 1fc2388ea..12112ce7a 100644
 
                      if (this.tracker instanceof EntityLiving) {
 -- 
-2.18.0
+2.51.0
 

patches/server/0028-Add-knockback-reduction.patch → patches/server/0027-Add-knockback-reduction.patch

@@ -1,11 +1,11 @@
-From c99d106af50781e034442476124a3444a9b9fc6b Mon Sep 17 00:00:00 2001
+From 20e9eee8fc1352ab6cc9f295b4ec63de0ad075e5 Mon Sep 17 00:00:00 2001
 From: cswhite2000 <18whitechristop@gmail.com>
 Date: Sun, 5 Aug 2018 16:02:05 -0700
 Subject: [PATCH] Add knockback reduction
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1c3677a46..a8f49e4cf 100644
+index 1c3677a4..a8f49e4c 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -907,9 +907,15 @@ public abstract class EntityLiving extends Entity {
@@ -28,7 +28,7 @@ index 1c3677a46..a8f49e4cf 100644
              this.motY += (double) f2;
              this.motZ -= d1 / (double) f1 * (double) f2;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 4f9179908..a2024f7e3 100644
+index 4f917990..a2024f7e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -44,6 +44,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -57,5 +57,5 @@ index 4f9179908..a2024f7e3 100644
          if (entity instanceof EntityArrow) {
              return ((EntityArrow) entity).isInGround();
 -- 
-2.18.0
+2.51.0
 

patches/server/0029-Add-log4j-s-exception-marker-to-log-messages-with-ex.patch → patches/server/0028-Add-log4j-s-exception-marker-to-log-messages-with-ex.patch

@@ -1,11 +1,11 @@
-From c4df069253cc1ae38832b954aa2d9715de49f65b Mon Sep 17 00:00:00 2001
+From 1f14c5eaab56e4c64c5a960921d5a619ee7b81e2 Mon Sep 17 00:00:00 2001
 From: cswhite2000 <18whitechristop@gmail.com>
 Date: Sun, 5 Aug 2018 16:25:52 -0700
 Subject: [PATCH] Add log4j's exception marker to log messages with exceptions
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/ForwardLogHandler.java b/src/main/java/org/bukkit/craftbukkit/util/ForwardLogHandler.java
-index 74ce4b2ec..e35c6cf2e 100644
+index 74ce4b2e..e35c6cf2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/ForwardLogHandler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/ForwardLogHandler.java
 @@ -2,6 +2,8 @@ package org.bukkit.craftbukkit.util;
@@ -42,5 +42,5 @@ index 74ce4b2ec..e35c6cf2e 100644
      }
 
 -- 
-2.18.0
+2.51.0
 

patches/server/0030-Keep-players-in-the-player-list-while-respawning.patch → patches/server/0029-Keep-players-in-the-player-list-while-respawning.patch

@@ -1,11 +1,11 @@
-From 3c13b91ed96366df6907e8ffbfd571015ba2de06 Mon Sep 17 00:00:00 2001
+From 25bac597655ba55fe24b2defcc2540de57af206a Mon Sep 17 00:00:00 2001
 From: cswhite2000 <18whitechristop@gmail.com>
 Date: Sun, 5 Aug 2018 18:17:01 -0700
 Subject: [PATCH] Keep players in the player list while respawning
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 3c2d3197f..f38ab7156 100644
+index 3c2d3197..f38ab715 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -559,6 +559,7 @@ public abstract class PlayerList {
@@ -32,5 +32,5 @@ index 3c2d3197f..f38ab7156 100644
              this.j.put(entityplayer1.getUniqueID(), entityplayer1);
          }
 -- 
-2.18.0
+2.51.0
 

patches/server/0031-Implement-equals-and-hashCode-for-DoubleChestInvento.patch → patches/server/0030-Implement-equals-and-hashCode-for-DoubleChestInvento.patch

@@ -1,11 +1,11 @@
-From 85f4b3cafdf9d54a958d407ea1b7dd5a9b52d414 Mon Sep 17 00:00:00 2001
+From aa9877552b976593350d0c8cc90d7064a724576c Mon Sep 17 00:00:00 2001
 From: cswhite2000 <18whitechristop@gmail.com>
 Date: Sun, 5 Aug 2018 18:19:52 -0700
 Subject: [PATCH] Implement equals() and hashCode() for DoubleChestInventory
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java
-index 87252cad4..99b2a4078 100644
+index 87252cad..99b2a407 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java
 @@ -59,4 +59,17 @@ public class CraftInventoryDoubleChest extends CraftInventory implements DoubleC
@@ -27,5 +27,5 @@ index 87252cad4..99b2a4078 100644
 +
  }
 -- 
-2.18.0
+2.51.0
 

patches/server/0032-Fix-deadlock-during-shutdown.patch → patches/server/0031-Fix-deadlock-during-shutdown.patch

@@ -1,11 +1,11 @@
-From 8dfe097a21379377ba559e793d0b6d9735c8ff2b Mon Sep 17 00:00:00 2001
+From 3455549611fa15ff02ec8c291889822345d4a04c Mon Sep 17 00:00:00 2001
 From: cswhite2000 <18whitechristop@gmail.com>
 Date: Sun, 5 Aug 2018 19:59:31 -0700
 Subject: [PATCH] Fix deadlock during shutdown
 
 
 diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java
-index f13182c18..eb2231062 100644
+index f13182c1..eb223106 100644
 --- a/src/main/java/net/minecraft/server/ServerConnection.java
 +++ b/src/main/java/net/minecraft/server/ServerConnection.java
 @@ -20,6 +20,7 @@ import io.netty.util.concurrent.Future;
@@ -54,5 +54,5 @@ index f13182c18..eb2231062 100644
      }
 
 -- 
-2.18.0
+2.51.0
 

patches/server/0033-Simple-bulk-block-replacement.patch → patches/server/0032-Simple-bulk-block-replacement.patch

@@ -1,11 +1,11 @@
-From 69adb4b86d5ab5fffa48755b0239c134f46af194 Mon Sep 17 00:00:00 2001
+From 16c4c777fcce3ba9dbcf8fa954b9474572b4a445 Mon Sep 17 00:00:00 2001
 From: cswhite2000 <18whitechristop@gmail.com>
 Date: Sun, 5 Aug 2018 20:42:11 -0700
 Subject: [PATCH] Simple bulk block replacement
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 8a33e282c..b425a7d37 100644
+index 8a33e282..b425a7d3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -6,12 +6,14 @@ import java.util.Arrays;
@@ -61,5 +61,5 @@ index 8a33e282c..b425a7d37 100644
          BiomeBase[] biomes = chunkmanager.getBiomes(null, chunkX, chunkZ, 16, 16);
          float[] temps = new float[biomes.length];
 -- 
-2.18.0
+2.51.0
 

patches/server/0034-Fix-damageEntity-cancelling-in-vehicles.patch → patches/server/0033-Fix-damageEntity-cancelling-in-vehicles.patch

@@ -1,11 +1,11 @@
-From 71eee6e066e2d4730612afa0baa1343ca02cf501 Mon Sep 17 00:00:00 2001
+From 87c337e169f2cbefb5e3513b1f01e769927a657e Mon Sep 17 00:00:00 2001
 From: cswhite2000 <18whitechristop@gmail.com>
 Date: Sun, 5 Aug 2018 20:45:25 -0700
 Subject: [PATCH] Fix damageEntity cancelling in vehicles
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
-index 0e6f8c035..3a6bbe4a9 100644
+index 0e6f8c03..3a6bbe4a 100644
 --- a/src/main/java/net/minecraft/server/EntityBoat.java
 +++ b/src/main/java/net/minecraft/server/EntityBoat.java
 @@ -106,7 +106,7 @@ public class EntityBoat extends Entity {
@@ -18,7 +18,7 @@ index 0e6f8c035..3a6bbe4a9 100644
                  // f = event.getDamage(); // TODO Why don't we do this?
                  // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index 4bf790cdf..70a8a679a 100644
+index 4bf790cd..70a8a679 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -122,7 +122,7 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT
@@ -31,5 +31,5 @@ index 4bf790cdf..70a8a679a 100644
 
                  f = (float) event.getDamage();
 -- 
-2.18.0
+2.51.0