Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix ambiguous error in obfhelper

Browse Source
This commit is contained in:
William Blake Galbreath
2019-07-10 20:32:52 -05:00
parent bd3407f5dd
commit 662d02c216
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0010-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
View File

@@ -1,4 +1,4 @@
From 76c45487e76be7cbec6df4e8438bc79095cc5227 Mon Sep 17 00:00:00 2001 From f6c6b9e66cc428f9b1b9f697c6dfedaba39c2ef2 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 9 May 2019 18:26:06 -0500 Date: Thu, 9 May 2019 18:26:06 -0500
Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
@@ -54,7 +54,7 @@ index dd7da4117..adfd6e855 100644
return null; return null;
} else if (this.world.isClientSide) { } else if (this.world.isClientSide) {
diff --git a/src/main/java/net/minecraft/server/EntityEnderCrystal.java b/src/main/java/net/minecraft/server/EntityEnderCrystal.java diff --git a/src/main/java/net/minecraft/server/EntityEnderCrystal.java b/src/main/java/net/minecraft/server/EntityEnderCrystal.java
index 801552fc6..b3366b461 100644 index 801552fc6..ad88cc982 100644
--- a/src/main/java/net/minecraft/server/EntityEnderCrystal.java --- a/src/main/java/net/minecraft/server/EntityEnderCrystal.java
+++ b/src/main/java/net/minecraft/server/EntityEnderCrystal.java +++ b/src/main/java/net/minecraft/server/EntityEnderCrystal.java
@@ -13,6 +13,12 @@ public class EntityEnderCrystal extends Entity { @@ -13,6 +13,12 @@ public class EntityEnderCrystal extends Entity {
@@ -80,7 +80,7 @@ index 801552fc6..b3366b461 100644
+ } + }
+ +
+ if (targetPhantom == null) { + if (targetPhantom == null) {
+ for (EntityPhantom phantom : world.getEntities(EntityPhantom.class, getBoundingBox().grow(16, 16, 16))) { + for (EntityPhantom phantom : world.getEntitiesByClass(EntityPhantom.class, getBoundingBox().grow(16, 16, 16))) {
+ if (phantom.hasLineOfSight(this)) { + if (phantom.hasLineOfSight(this)) {
+ attackPhantom(phantom); + attackPhantom(phantom);
+ break; + break;
@@ -122,7 +122,7 @@ index 801552fc6..b3366b461 100644
@Override @Override
protected void b(NBTTagCompound nbttagcompound) { protected void b(NBTTagCompound nbttagcompound) {
diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
index b672ac5c2..4e07287e9 100644 index b672ac5c2..e75914c2b 100644
--- a/src/main/java/net/minecraft/server/EntityPhantom.java --- a/src/main/java/net/minecraft/server/EntityPhantom.java
+++ b/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
@@ -8,9 +8,10 @@ import javax.annotation.Nullable; @@ -8,9 +8,10 @@ import javax.annotation.Nullable;
@@ -195,7 +195,7 @@ index b672ac5c2..4e07287e9 100644
+ @Override + @Override
+ public boolean a() { // shouldExecute + public boolean a() { // shouldExecute
+ double range = maxTargetRange(); + double range = maxTargetRange();
+ List<EntityEnderCrystal> crystals = world.getEntities(EntityEnderCrystal.class, phantom.getBoundingBox().grow(range, range, range)); + List<EntityEnderCrystal> crystals = world.getEntitiesByClass(EntityEnderCrystal.class, phantom.getBoundingBox().grow(range, range, range));
+ if (crystals.isEmpty()) { + if (crystals.isEmpty()) {
+ return false; + return false;
+ } + }
@@ -351,14 +351,14 @@ index b672ac5c2..4e07287e9 100644
@Override @Override
diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
index 3a86c519c..9f78ae099 100644 index 3a86c519c..9a0521f2a 100644
--- a/src/main/java/net/minecraft/server/IEntityAccess.java --- a/src/main/java/net/minecraft/server/IEntityAccess.java
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
@@ -30,6 +30,7 @@ public interface IEntityAccess { @@ -30,6 +30,7 @@ public interface IEntityAccess {
}); });
} }
+ default <T extends Entity> List<T> getEntities(Class<? extends T> oclass, AxisAlignedBB axisalignedbb) { return a(oclass, axisalignedbb); } // Purpur - OBFHELPER + default <T extends Entity> List<T> getEntitiesByClass(Class<? extends T> oclass, AxisAlignedBB axisalignedbb) { return a(oclass, axisalignedbb); } // Purpur - OBFHELPER
default <T extends Entity> List<T> a(Class<? extends T> oclass, AxisAlignedBB axisalignedbb) { default <T extends Entity> List<T> a(Class<? extends T> oclass, AxisAlignedBB axisalignedbb) {
return this.a(oclass, axisalignedbb, IEntitySelector.f); return this.a(oclass, axisalignedbb, IEntitySelector.f);
} }

6
patches/server/0011-Integrate-ridables.patch
View File

@@ -1,4 +1,4 @@
From e1588564c74131a5b5b60262ea82f7df7607f8d7 Mon Sep 17 00:00:00 2001 From ec10b4fae72d2d0ad626d5f6a8b8d7638e73d6cc Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 30 Apr 2019 19:17:21 -0500 Date: Tue, 30 Apr 2019 19:17:21 -0500
Subject: [PATCH] Integrate ridables Subject: [PATCH] Integrate ridables
@@ -2055,7 +2055,7 @@ index 94e973ffb..d743ddb9c 100644
@Nullable @Nullable
diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
index 4e07287e9..7f414aee9 100644 index e75914c2b..008f5c6fa 100644
--- a/src/main/java/net/minecraft/server/EntityPhantom.java --- a/src/main/java/net/minecraft/server/EntityPhantom.java
+++ b/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
@@ -15,12 +15,14 @@ public class EntityPhantom extends EntityFlying implements IMonster { @@ -15,12 +15,14 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -2088,7 +2088,7 @@ index 4e07287e9..7f414aee9 100644
public boolean a() { // shouldExecute public boolean a() { // shouldExecute
+ if (this.phantom.getRider() != null) return false; + if (this.phantom.getRider() != null) return false;
double range = maxTargetRange(); double range = maxTargetRange();
List<EntityEnderCrystal> crystals = world.getEntities(EntityEnderCrystal.class, phantom.getBoundingBox().grow(range, range, range)); List<EntityEnderCrystal> crystals = world.getEntitiesByClass(EntityEnderCrystal.class, phantom.getBoundingBox().grow(range, range, range));
if (crystals.isEmpty()) { if (crystals.isEmpty()) {
@@ -254,6 +257,7 @@ public class EntityPhantom extends EntityFlying implements IMonster { @@ -254,6 +257,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {