mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-06-18 14:50:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed eyes of enders not properly targeting strongholds.

Browse Source
This commit is contained in:
Vatuu
2022-10-28 22:02:05 +02:00
parent 7dd1d3881a
commit 34670759e9
1 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java
+31 -27
View File
@@ -24,20 +24,19 @@ import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.format.C; import com.volmit.iris.util.format.C;
import com.volmit.iris.util.math.Position2; import com.volmit.iris.util.math.Position2;
import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.plugin.VolmitSender;
import org.bukkit.Bukkit; import org.bukkit.*;
import org.bukkit.Location;
import org.bukkit.Sound;
import org.bukkit.entity.EnderSignal; import org.bukkit.entity.EnderSignal;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.block.Action;
import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.entity.EntitySpawnEvent; import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.world.ChunkLoadEvent; import org.bukkit.event.world.ChunkLoadEvent;
import org.bukkit.event.world.WorldSaveEvent; import org.bukkit.event.world.WorldSaveEvent;
import org.bukkit.event.world.WorldUnloadEvent; import org.bukkit.event.world.WorldUnloadEvent;
import org.bukkit.inventory.EquipmentSlot;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
@@ -100,35 +99,40 @@ public abstract class EngineAssignedWorldManager extends EngineAssignedComponent
} }
@EventHandler @EventHandler
public void on(EntitySpawnEvent e) { public void onItemUse(PlayerInteractEvent e) {
if(e.getEntity().getWorld().equals(getTarget().getWorld().realWorld())) { if(e.getItem() == null || e.getHand() != EquipmentSlot.HAND)
if(e.getEntityType().equals(EntityType.ENDER_SIGNAL)) { return;
KList<Position2> p = getEngine().getDimension().getStrongholds(getEngine().getSeedManager().getSpawn()); if(e.getAction() == Action.LEFT_CLICK_BLOCK || e.getAction() == Action.LEFT_CLICK_AIR)
Position2 px = new Position2(e.getEntity().getLocation().getBlockX(), e.getEntity().getLocation().getBlockZ()); return;
Position2 pr = null; if(e.getPlayer().getWorld().equals(getTarget().getWorld().realWorld()) && e.getItem().getType() == Material.ENDER_EYE) {
double d = Double.MAX_VALUE; KList<Position2> positions = getEngine().getDimension().getStrongholds(getEngine().getSeedManager().getSpawn());
if(positions.isEmpty())
return;
Iris.debug("Ps: " + p.size()); Position2 playerPos = new Position2(e.getPlayer().getLocation().getBlockX(), e.getPlayer().getLocation().getBlockZ());
Position2 pr = positions.get(0);
double d = pr.distance(playerPos);
for(Position2 i : p) { for(Position2 pos : positions) {
Iris.debug("- " + i.getX() + " " + i.getZ()); double distance = pos.distance(playerPos);
} if(distance < d) {
d = distance;
for(Position2 i : p) { pr = pos;
double dx = i.distance(px);
if(dx < d) {
d = dx;
pr = i;
} }
} }
if(pr != null) { if(e.getPlayer().getGameMode() != GameMode.CREATIVE) {
e.getEntity().getWorld().playSound(e.getEntity().getLocation(), Sound.ITEM_TRIDENT_THROW, 1f, 1.6f); if(e.getItem().getAmount() > 1) {
Location ll = new Location(e.getEntity().getWorld(), pr.getX(), 40, pr.getZ()); e.getPlayer().getInventory().getItemInMainHand().setAmount(e.getItem().getAmount() - 1);
Iris.debug("ESignal: " + ll.getBlockX() + " " + ll.getBlockZ()); } else {
((EnderSignal) e.getEntity()).setTargetLocation(ll); e.getPlayer().getInventory().setItemInMainHand(null);
} }
} }
EnderSignal eye = e.getPlayer().getWorld().spawn(e.getPlayer().getLocation().clone().add(0, 0.5F, 0), EnderSignal.class);
eye.setTargetLocation(new Location(e.getPlayer().getWorld(), pr.getX(), 40, pr.getZ()));
eye.getWorld().playSound(eye, Sound.ENTITY_ENDER_EYE_LAUNCH, 1, 1);
Iris.debug("ESignal: " + eye.getTargetLocation().getBlockX() + " " + eye.getTargetLocation().getBlockX());
} }
} }