From 1fe6a8c4d81a285c4ade49cc4fc3258e0bb9675f Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 18 Feb 2020 22:02:56 -0600 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appears to apply and compile correctly Paper Changes: e1f3b6d0 fix tripwire hook BlockPlaceEvent (fixes #2969) (#2971) --- Paper | 2 +- current-paper | 2 +- patches/server/0004-Ridables.patch | 6 +++--- ...-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Paper b/Paper index 33a615de4..e1f3b6d03 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 33a615de432b3e72460cd0504af2cd3c56712763 +Subproject commit e1f3b6d03326f19ac17b89ba36910be27e126bd3 diff --git a/current-paper b/current-paper index b7df7de1d..73381b23e 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.15.2--f20b19ba4b0cc8ab294f945faebf1a61ad9264a7 +1.15.2--9b7af8fccbac13605f5fcc2c1c9a892ebf04a11a diff --git a/patches/server/0004-Ridables.patch b/patches/server/0004-Ridables.patch index d2ec2da73..392a63300 100644 --- a/patches/server/0004-Ridables.patch +++ b/patches/server/0004-Ridables.patch @@ -1,4 +1,4 @@ -From 40c93de5dc9e698a07b3468e2ee297665ca12818 Mon Sep 17 00:00:00 2001 +From 93bd02ed77297b7123ec4b9208f2bd43d5a7d827 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 6 Feb 2020 19:53:59 -0600 Subject: [PATCH] Ridables @@ -4556,10 +4556,10 @@ index 0c7f094e54..212af252be 100644 return new Vec3D(this.x * d0, this.y * d1, this.z * d2); } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 4e8a53d104..b8e4a80b05 100644 +index 89090b12d2..7db28d954f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1581,4 +1581,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1583,4 +1583,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @Override public BiomeManager d() { return this.biomeManager; } diff --git a/patches/server/0082-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0082-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch index d5c42cd72..2e6dfb949 100644 --- a/patches/server/0082-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch +++ b/patches/server/0082-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch @@ -1,4 +1,4 @@ -From e92f6163cd2029aa860d6b3721c06b45d15f47bd Mon Sep 17 00:00:00 2001 +From 458f0fc2f0504c78a8ff6c62c164d3f71e3e7ba5 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 01:42:50 -0500 Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases @@ -9,10 +9,10 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b8e4a80b05..f18bb28990 100644 +index 7db28d954f..989e68fa1c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1387,8 +1387,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1389,8 +1389,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { return blockposition; }