Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07:43 +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

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>
Date: Tue, 30 Apr 2019 19:17:21 -0500
Subject: [PATCH] Integrate ridables
@@ -2055,7 +2055,7 @@ index 94e973ffb..d743ddb9c 100644
@Nullable
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
+++ b/src/main/java/net/minecraft/server/EntityPhantom.java
@@ -15,12 +15,14 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -2088,7 +2088,7 @@ index 4e07287e9..7f414aee9 100644
public boolean a() { // shouldExecute
+ if (this.phantom.getRider() != null) return false;
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()) {
@@ -254,6 +257,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {