From cd80c0a2f777d2769fecc4f56a8416478a9fd936 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Tue, 20 Dec 2016 18:01:37 -0600
Subject: [PATCH] Fix a merge conflict that was resolved improperly

---
 .../Speedup-BlockPos-by-fixing-inlining.patch        | 12 ++++++------
 Spigot-Server-Patches/Timings-v2.patch               |  3 ---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Spigot-Server-Patches/Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/Speedup-BlockPos-by-fixing-inlining.patch
index ad46cb8634..347243bd99 100644
--- a/Spigot-Server-Patches/Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/Speedup-BlockPos-by-fixing-inlining.patch
@@ -87,12 +87,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                                this.b.b = i;
 -                                this.b.c = j;
 -                                ++this.b.d;
-+                            if (((BaseBlockPosition)this.b).a < l) {
-+                                ++((BaseBlockPosition)this.b).a;
-+                            } else if (((BaseBlockPosition)this.b).b < i1) {
-+                                ((BaseBlockPosition)this.b).a = i;
-+                                ++((BaseBlockPosition)this.b).b;
-+                            } else if (((BaseBlockPosition)this.b).c < j1) {
++                            if (((BaseBlockPosition) this.b).a < l) {
++                                ++((BaseBlockPosition) this.b).a;
++                            } else if (((BaseBlockPosition) this.b).b < i1) {
++                                ((BaseBlockPosition) this.b).a = i;
++                                ++((BaseBlockPosition) this.b).b;
++                            } else if (((BaseBlockPosition) this.b).c < j1) {
 +                                ((BaseBlockPosition) this.b).a = i;
 +                                ((BaseBlockPosition) this.b).b = j;
 +                                ++((BaseBlockPosition) this.b).c;
diff --git a/Spigot-Server-Patches/Timings-v2.patch b/Spigot-Server-Patches/Timings-v2.patch
index 5207e5d4c5..023df7124c 100644
--- a/Spigot-Server-Patches/Timings-v2.patch
+++ b/Spigot-Server-Patches/Timings-v2.patch
@@ -1169,9 +1169,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                    entity.tickTimer.startTiming(); // Paper
                      this.h(entity);
 -                    SpigotTimings.tickEntityTimer.stopTiming(); // Spigot
-+                    entity.tickTimer.stopTiming(); // Paper
-+                    entity.tickTimer.startTiming(); // Paper
-+                    this.g(entity);
 +                    entity.tickTimer.stopTiming(); // Paper
                  } catch (Throwable throwable1) {
 +                    entity.tickTimer.stopTiming();