Rebuild patches

This commit is contained in:
William Blake Galbreath
2020-04-04 20:28:11 -05:00
parent 7a9fb595ad
commit 1c4687461d
98 changed files with 330 additions and 313 deletions

View File

@@ -1,4 +1,4 @@
From a89bbe90c2218f7ce1a2c106f2c8d0166290ef21 Mon Sep 17 00:00:00 2001
From 106e7e57474342b5a012d4bad86fe8438a8cc663 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 27 Feb 2020 13:39:06 -0600
Subject: [PATCH] decompile-fixes
@@ -88,10 +88,11 @@ Subject: [PATCH] decompile-fixes
.../net/minecraft/server/EntityParrot.java | 4 +--
.../net/minecraft/server/EntitySheep.java | 6 ++---
.../net/minecraft/server/EntityWitch.java | 4 +--
.../net/minecraft/server/GeneratorAccess.java | 2 +-
.../java/net/minecraft/server/MathHelper.java | 2 +-
.../server/WorldGenFeatureConfigured.java | 2 +-
.../server/WorldGenFeatureTreeBeehive.java | 2 +-
87 files changed, 226 insertions(+), 232 deletions(-)
88 files changed, 227 insertions(+), 233 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BiomeBambooJungle.java b/src/main/java/net/minecraft/server/BiomeBambooJungle.java
index de831ed87e..9c38f8907a 100644
@@ -1561,6 +1562,19 @@ index 7b6b1ad17b..1432d3f6bf 100644
this.targetSelector.a(2, this.bz);
this.targetSelector.a(3, this.bA);
}
diff --git a/src/main/java/net/minecraft/server/GeneratorAccess.java b/src/main/java/net/minecraft/server/GeneratorAccess.java
index e865a5694f..acc5f61ced 100644
--- a/src/main/java/net/minecraft/server/GeneratorAccess.java
+++ b/src/main/java/net/minecraft/server/GeneratorAccess.java
@@ -49,7 +49,7 @@ public interface GeneratorAccess extends IEntityAccess, IWorldReader, VirtualLev
void a(@Nullable EntityHuman entityhuman, int i, BlockPosition blockposition, int j);
default void triggerEffect(int i, BlockPosition blockposition, int j) {
- this.a((EntityHuman) null, i, blockposition, j);
+ this.a(null, i, blockposition, j); // Purpur - decompile error
}
@Override
diff --git a/src/main/java/net/minecraft/server/MathHelper.java b/src/main/java/net/minecraft/server/MathHelper.java
index 38b79b5b10..c4aa38ddf1 100644
--- a/src/main/java/net/minecraft/server/MathHelper.java