From 58db6dc333cc247e1276845ab37aefdd9fd39b8d Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 9 May 2019 14:58:38 -0500 Subject: [PATCH] Reorder patches --- ...-touch-spawners.patch => 0008-Silk-touch-spawners.patch} | 2 +- ...tegrate-ridables.patch => 0009-Integrate-ridables.patch} | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename patches/server/{0009-Silk-touch-spawners.patch => 0008-Silk-touch-spawners.patch} (98%) rename patches/server/{0008-Integrate-ridables.patch => 0009-Integrate-ridables.patch} (99%) diff --git a/patches/server/0009-Silk-touch-spawners.patch b/patches/server/0008-Silk-touch-spawners.patch similarity index 98% rename from patches/server/0009-Silk-touch-spawners.patch rename to patches/server/0008-Silk-touch-spawners.patch index 6028ab2b0..d19e1c608 100644 --- a/patches/server/0009-Silk-touch-spawners.patch +++ b/patches/server/0008-Silk-touch-spawners.patch @@ -1,4 +1,4 @@ -From 5106aa0fddffb484b3a0a97d3fff0761814e81b2 Mon Sep 17 00:00:00 2001 +From 2f26b5ae47d6b6528c3955c8244da07a298deded Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 9 May 2019 14:27:37 -0500 Subject: [PATCH] Silk touch spawners diff --git a/patches/server/0008-Integrate-ridables.patch b/patches/server/0009-Integrate-ridables.patch similarity index 99% rename from patches/server/0008-Integrate-ridables.patch rename to patches/server/0009-Integrate-ridables.patch index ce8f27290..ed22228ed 100644 --- a/patches/server/0008-Integrate-ridables.patch +++ b/patches/server/0009-Integrate-ridables.patch @@ -1,4 +1,4 @@ -From 2de5e5fb595c7060de3ebe191e00acc78449b8c2 Mon Sep 17 00:00:00 2001 +From ef2801006bcaeab3d67c10a64461823cfce892e4 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 30 Apr 2019 19:17:21 -0500 Subject: [PATCH] Integrate ridables @@ -126,7 +126,7 @@ index 454627f65..df3d6cf28 100644 this.d = false; this.a.aM = this.a(this.a.aM, this.h() + 20.0F, this.b); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 7bdc0f4a5..af7a4f89b 100644 +index 9834a8928..1b38ac55c 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -101,6 +101,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -1058,7 +1058,7 @@ index 7aebc90af..97a5dcfd0 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 488ecbaa9..4a1fefbb4 100644 +index b27a9efcc..40264185a 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -88,9 +88,9 @@ public abstract class EntityLiving extends Entity {