Upstream/HolographicDisplays
1
0
Fork 0
mirror of https://github.com/filoghost/HolographicDisplays.git synced 2024-11-23 19:05:12 +01:00
Code Issues Projects Releases Wiki Activity

Small refactoring

Browse Source
This commit is contained in:
filoghost 2021-05-04 20:37:51 +02:00
parent aacc7fdeb4
commit de3f967a21
21 changed files with 67 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/me/filoghost/holographicdisplays/core/Utils.java
View File

@ -8,6 +8,10 @@ package me.filoghost.holographicdisplays.core;
import me.filoghost.fcommons.Strings; import me.filoghost.fcommons.Strings;
public class Utils { public class Utils {
public static double distanceSquared(double locX1, double locX2, double locZ1, double locZ2) {
return square(locX1 - locX2) + square(locZ1 - locZ2);
}
public static double square(double num) { public static double square(double num) {
return num * num; return num * num;

6
nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSArmorStand.java
View File

@ -215,12 +215,12 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
private void broadcastLocationPacketNMS() { private void broadcastLocationPacketNMS() {
PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this); PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this);
for (Object humanEntity : super.world.players) { for (EntityHuman humanEntity : super.world.players) {
if (humanEntity instanceof EntityPlayer) { if (humanEntity instanceof EntityPlayer) {
EntityPlayer nmsPlayer = (EntityPlayer) humanEntity; EntityPlayer nmsPlayer = (EntityPlayer) humanEntity;
double distanceSquared = Utils.square(nmsPlayer.locX - super.locX) + Utils.square(nmsPlayer.locZ - super.locZ); double distanceSquared = Utils.distanceSquared(nmsPlayer.locX, super.locX, nmsPlayer.locZ, super.locZ);
if (distanceSquared < 8192 && nmsPlayer.playerConnection != null) { if (distanceSquared < 64 * 64 * 2 && nmsPlayer.playerConnection != null) {
nmsPlayer.playerConnection.sendPacket(teleportPacket); nmsPlayer.playerConnection.sendPacket(teleportPacket);
} }
} }

6
nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSItem.java
View File

@ -53,12 +53,12 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
// Send a packet near to "remind" players that the item is riding the armor stand (Spigot bug or client bug) // Send a packet near to "remind" players that the item is riding the armor stand (Spigot bug or client bug)
PacketPlayOutMount mountPacket = new PacketPlayOutMount(vehicle); PacketPlayOutMount mountPacket = new PacketPlayOutMount(vehicle);
for (Object humanEntity : super.world.players) { for (EntityHuman humanEntity : super.world.players) {
if (humanEntity instanceof EntityPlayer) { if (humanEntity instanceof EntityPlayer) {
EntityPlayer nmsPlayer = (EntityPlayer) humanEntity; EntityPlayer nmsPlayer = (EntityPlayer) humanEntity;
double distanceSquared = Utils.square(nmsPlayer.locX - super.locX) + Utils.square(nmsPlayer.locZ - super.locZ); double distanceSquared = Utils.distanceSquared(nmsPlayer.locX, super.locX, nmsPlayer.locZ, super.locZ);
if (distanceSquared < 1024 && nmsPlayer.playerConnection != null) { if (distanceSquared < 32 * 32 && nmsPlayer.playerConnection != null) {
nmsPlayer.playerConnection.sendPacket(mountPacket); nmsPlayer.playerConnection.sendPacket(mountPacket);
} }
} }

7
nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSSlime.java
View File

@ -12,6 +12,7 @@ import net.minecraft.server.v1_10_R1.AxisAlignedBB;
import net.minecraft.server.v1_10_R1.DamageSource; import net.minecraft.server.v1_10_R1.DamageSource;
import net.minecraft.server.v1_10_R1.Entity; import net.minecraft.server.v1_10_R1.Entity;
import net.minecraft.server.v1_10_R1.EntityDamageSource; import net.minecraft.server.v1_10_R1.EntityDamageSource;
import net.minecraft.server.v1_10_R1.EntityHuman;
import net.minecraft.server.v1_10_R1.EntityPlayer; import net.minecraft.server.v1_10_R1.EntityPlayer;
import net.minecraft.server.v1_10_R1.EntitySlime; import net.minecraft.server.v1_10_R1.EntitySlime;
import net.minecraft.server.v1_10_R1.NBTTagCompound; import net.minecraft.server.v1_10_R1.NBTTagCompound;
@ -55,12 +56,12 @@ public class EntityNMSSlime extends EntitySlime implements NMSSlime {
// Send a packet near to "remind" players that the slime is riding the armor stand (Spigot bug or client bug) // Send a packet near to "remind" players that the slime is riding the armor stand (Spigot bug or client bug)
PacketPlayOutMount mountPacket = new PacketPlayOutMount(vehicle); PacketPlayOutMount mountPacket = new PacketPlayOutMount(vehicle);
for (Object humanEntity : super.world.players) { for (EntityHuman humanEntity : super.world.players) {
if (humanEntity instanceof EntityPlayer) { if (humanEntity instanceof EntityPlayer) {
EntityPlayer nmsPlayer = (EntityPlayer) humanEntity; EntityPlayer nmsPlayer = (EntityPlayer) humanEntity;
double distanceSquared = Utils.square(nmsPlayer.locX - super.locX) + Utils.square(nmsPlayer.locZ - super.locZ); double distanceSquared = Utils.distanceSquared(nmsPlayer.locX, super.locX, nmsPlayer.locZ, super.locZ);
if (distanceSquared < 1024 && nmsPlayer.playerConnection != null) { if (distanceSquared < 32 * 32 && nmsPlayer.playerConnection != null) {
nmsPlayer.playerConnection.sendPacket(mountPacket); nmsPlayer.playerConnection.sendPacket(mountPacket);
} }
} }

6
nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/EntityNMSArmorStand.java
View File

@ -215,12 +215,12 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
private void broadcastLocationPacketNMS() { private void broadcastLocationPacketNMS() {
PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this); PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this);
for (Object humanEntity : super.world.players) { for (EntityHuman humanEntity : super.world.players) {
if (humanEntity instanceof EntityPlayer) { if (humanEntity instanceof EntityPlayer) {
EntityPlayer nmsPlayer = (EntityPlayer) humanEntity; EntityPlayer nmsPlayer = (EntityPlayer) humanEntity;
double distanceSquared = Utils.square(nmsPlayer.locX - super.locX) + Utils.square(nmsPlayer.locZ - super.locZ); double distanceSquared = Utils.distanceSquared(nmsPlayer.locX, super.locX, nmsPlayer.locZ, super.locZ);
if (distanceSquared < 8192 && nmsPlayer.playerConnection != null) { if (distanceSquared < 64 * 64 * 2 && nmsPlayer.playerConnection != null) {
nmsPlayer.playerConnection.sendPacket(teleportPacket); nmsPlayer.playerConnection.sendPacket(teleportPacket);
} }
} }

6
nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/EntityNMSArmorStand.java
View File

@ -215,12 +215,12 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
private void broadcastLocationPacketNMS() { private void broadcastLocationPacketNMS() {
PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this); PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this);
for (Object humanEntity : super.world.players) { for (EntityHuman humanEntity : super.world.players) {
if (humanEntity instanceof EntityPlayer) { if (humanEntity instanceof EntityPlayer) {
EntityPlayer nmsPlayer = (EntityPlayer) humanEntity; EntityPlayer nmsPlayer = (EntityPlayer) humanEntity;
double distanceSquared = Utils.square(nmsPlayer.locX - super.locX) + Utils.square(nmsPlayer.locZ - super.locZ); double distanceSquared = Utils.distanceSquared(nmsPlayer.locX, super.locX, nmsPlayer.locZ, super.locZ);
if (distanceSquared < 8192 && nmsPlayer.playerConnection != null) { if (distanceSquared < 64 * 64 * 2 && nmsPlayer.playerConnection != null) {
nmsPlayer.playerConnection.sendPacket(teleportPacket); nmsPlayer.playerConnection.sendPacket(teleportPacket);
} }
} }

6
nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/EntityNMSArmorStand.java
View File

@ -217,12 +217,12 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
private void broadcastLocationPacketNMS() { private void broadcastLocationPacketNMS() {
PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this); PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this);
for (Object humanEntity : super.world.players) { for (EntityHuman humanEntity : super.world.players) {
if (humanEntity instanceof EntityPlayer) { if (humanEntity instanceof EntityPlayer) {
EntityPlayer nmsPlayer = (EntityPlayer) humanEntity; EntityPlayer nmsPlayer = (EntityPlayer) humanEntity;
double distanceSquared = Utils.square(nmsPlayer.locX - super.locX) + Utils.square(nmsPlayer.locZ - super.locZ); double distanceSquared = Utils.distanceSquared(nmsPlayer.locX, super.locX, nmsPlayer.locZ, super.locZ);
if (distanceSquared < 8192 && nmsPlayer.playerConnection != null) { if (distanceSquared < 64 * 64 * 2 && nmsPlayer.playerConnection != null) {
nmsPlayer.playerConnection.sendPacket(teleportPacket); nmsPlayer.playerConnection.sendPacket(teleportPacket);
} }
} }

6
nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/EntityNMSArmorStand.java
View File

@ -217,12 +217,12 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
private void broadcastLocationPacketNMS() { private void broadcastLocationPacketNMS() {
PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this); PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this);
for (Object humanEntity : super.world.players) { for (EntityHuman humanEntity : super.world.players) {
if (humanEntity instanceof EntityPlayer) { if (humanEntity instanceof EntityPlayer) {
EntityPlayer nmsPlayer = (EntityPlayer) humanEntity; EntityPlayer nmsPlayer = (EntityPlayer) humanEntity;
double distanceSquared = Utils.square(nmsPlayer.locX - super.locX) + Utils.square(nmsPlayer.locZ - super.locZ); double distanceSquared = Utils.distanceSquared(nmsPlayer.locX, super.locX, nmsPlayer.locZ, super.locZ);
if (distanceSquared < 8192 && nmsPlayer.playerConnection != null) { if (distanceSquared < 64 * 64 * 2 && nmsPlayer.playerConnection != null) {
nmsPlayer.playerConnection.sendPacket(teleportPacket); nmsPlayer.playerConnection.sendPacket(teleportPacket);
} }
} }

6
nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/EntityNMSArmorStand.java
View File

@ -219,12 +219,12 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
private void broadcastLocationPacketNMS() { private void broadcastLocationPacketNMS() {
PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this); PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this);
for (Object humanEntity : super.world.getPlayers()) { for (EntityHuman humanEntity : super.world.getPlayers()) {
if (humanEntity instanceof EntityPlayer) { if (humanEntity instanceof EntityPlayer) {
EntityPlayer nmsPlayer = (EntityPlayer) humanEntity; EntityPlayer nmsPlayer = (EntityPlayer) humanEntity;
double distanceSquared = Utils.square(nmsPlayer.locX - super.locX) + Utils.square(nmsPlayer.locZ - super.locZ); double distanceSquared = Utils.distanceSquared(nmsPlayer.locX, super.locX, nmsPlayer.locZ, super.locZ);
if (distanceSquared < 8192 && nmsPlayer.playerConnection != null) { if (distanceSquared < 64 * 64 * 2 && nmsPlayer.playerConnection != null) {
nmsPlayer.playerConnection.sendPacket(teleportPacket); nmsPlayer.playerConnection.sendPacket(teleportPacket);
} }
} }

6
nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/EntityNMSArmorStand.java
View File

@ -219,12 +219,12 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
private void broadcastLocationPacketNMS() { private void broadcastLocationPacketNMS() {
PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this); PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this);
for (Object humanEntity : super.world.getPlayers()) { for (EntityHuman humanEntity : super.world.getPlayers()) {
if (humanEntity instanceof EntityPlayer) { if (humanEntity instanceof EntityPlayer) {
EntityPlayer nmsPlayer = (EntityPlayer) humanEntity; EntityPlayer nmsPlayer = (EntityPlayer) humanEntity;
double distanceSquared = Utils.square(nmsPlayer.locX() - super.locX()) + Utils.square(nmsPlayer.locZ() - super.locZ()); double distanceSquared = Utils.distanceSquared(nmsPlayer.locX(), super.locX(), nmsPlayer.locZ(), super.locZ());
if (distanceSquared < 8192 && nmsPlayer.playerConnection != null) { if (distanceSquared < 64 * 64 * 2 && nmsPlayer.playerConnection != null) {
nmsPlayer.playerConnection.sendPacket(teleportPacket); nmsPlayer.playerConnection.sendPacket(teleportPacket);
} }
} }

6
nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/EntityNMSArmorStand.java
View File

@ -219,12 +219,12 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
private void broadcastLocationPacketNMS() { private void broadcastLocationPacketNMS() {
PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this); PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this);
for (Object humanEntity : super.world.getPlayers()) { for (EntityHuman humanEntity : super.world.getPlayers()) {
if (humanEntity instanceof EntityPlayer) { if (humanEntity instanceof EntityPlayer) {
EntityPlayer nmsPlayer = (EntityPlayer) humanEntity; EntityPlayer nmsPlayer = (EntityPlayer) humanEntity;
double distanceSquared = Utils.square(nmsPlayer.locX() - super.locX()) + Utils.square(nmsPlayer.locZ() - super.locZ()); double distanceSquared = Utils.distanceSquared(nmsPlayer.locX(), super.locX(), nmsPlayer.locZ(), super.locZ());
if (distanceSquared < 8192 && nmsPlayer.playerConnection != null) { if (distanceSquared < 64 * 64 * 2 && nmsPlayer.playerConnection != null) {
nmsPlayer.playerConnection.sendPacket(teleportPacket); nmsPlayer.playerConnection.sendPacket(teleportPacket);
} }
} }

6
nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/EntityNMSArmorStand.java
View File

@ -219,12 +219,12 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
private void broadcastLocationPacketNMS() { private void broadcastLocationPacketNMS() {
PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this); PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this);
for (Object humanEntity : super.world.getPlayers()) { for (EntityHuman humanEntity : super.world.getPlayers()) {
if (humanEntity instanceof EntityPlayer) { if (humanEntity instanceof EntityPlayer) {
EntityPlayer nmsPlayer = (EntityPlayer) humanEntity; EntityPlayer nmsPlayer = (EntityPlayer) humanEntity;
double distanceSquared = Utils.square(nmsPlayer.locX() - super.locX()) + Utils.square(nmsPlayer.locZ() - super.locZ()); double distanceSquared = Utils.distanceSquared(nmsPlayer.locX(), super.locX(), nmsPlayer.locZ(), super.locZ());
if (distanceSquared < 8192 && nmsPlayer.playerConnection != null) { if (distanceSquared < 64 * 64 * 2 && nmsPlayer.playerConnection != null) {
nmsPlayer.playerConnection.sendPacket(teleportPacket); nmsPlayer.playerConnection.sendPacket(teleportPacket);
} }
} }

6
nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/EntityNMSArmorStand.java
View File

@ -219,12 +219,12 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
private void broadcastLocationPacketNMS() { private void broadcastLocationPacketNMS() {
PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this); PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this);
for (Object humanEntity : super.world.getPlayers()) { for (EntityHuman humanEntity : super.world.getPlayers()) {
if (humanEntity instanceof EntityPlayer) { if (humanEntity instanceof EntityPlayer) {
EntityPlayer nmsPlayer = (EntityPlayer) humanEntity; EntityPlayer nmsPlayer = (EntityPlayer) humanEntity;
double distanceSquared = Utils.square(nmsPlayer.locX() - super.locX()) + Utils.square(nmsPlayer.locZ() - super.locZ()); double distanceSquared = Utils.distanceSquared(nmsPlayer.locX(), super.locX(), nmsPlayer.locZ(), super.locZ());
if (distanceSquared < 8192 && nmsPlayer.playerConnection != null) { if (distanceSquared < 64 * 64 * 2 && nmsPlayer.playerConnection != null) {
nmsPlayer.playerConnection.sendPacket(teleportPacket); nmsPlayer.playerConnection.sendPacket(teleportPacket);
} }
} }

6
nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/EntityNMSArmorStand.java
View File

@ -204,12 +204,12 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
private void broadcastLocationPacketNMS() { private void broadcastLocationPacketNMS() {
PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this); PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this);
for (Object humanEntity : super.world.players) { for (EntityHuman humanEntity : super.world.players) {
if (humanEntity instanceof EntityPlayer) { if (humanEntity instanceof EntityPlayer) {
EntityPlayer nmsPlayer = (EntityPlayer) humanEntity; EntityPlayer nmsPlayer = (EntityPlayer) humanEntity;
double distanceSquared = Utils.square(nmsPlayer.locX - super.locX) + Utils.square(nmsPlayer.locZ - super.locZ); double distanceSquared = Utils.distanceSquared(nmsPlayer.locX, super.locX, nmsPlayer.locZ, super.locZ);
if (distanceSquared < 8192 && nmsPlayer.playerConnection != null) { if (distanceSquared < 64 * 64 * 2 && nmsPlayer.playerConnection != null) {
nmsPlayer.playerConnection.sendPacket(teleportPacket); nmsPlayer.playerConnection.sendPacket(teleportPacket);
} }
} }

6
nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/EntityNMSArmorStand.java
View File

@ -204,12 +204,12 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
private void broadcastLocationPacketNMS() { private void broadcastLocationPacketNMS() {
PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this); PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this);
for (Object humanEntity : super.world.players) { for (EntityHuman humanEntity : super.world.players) {
if (humanEntity instanceof EntityPlayer) { if (humanEntity instanceof EntityPlayer) {
EntityPlayer nmsPlayer = (EntityPlayer) humanEntity; EntityPlayer nmsPlayer = (EntityPlayer) humanEntity;
double distanceSquared = Utils.square(nmsPlayer.locX - super.locX) + Utils.square(nmsPlayer.locZ - super.locZ); double distanceSquared = Utils.distanceSquared(nmsPlayer.locX, super.locX, nmsPlayer.locZ, super.locZ);
if (distanceSquared < 8192 && nmsPlayer.playerConnection != null) { if (distanceSquared < 64 * 64 * 2 && nmsPlayer.playerConnection != null) {
nmsPlayer.playerConnection.sendPacket(teleportPacket); nmsPlayer.playerConnection.sendPacket(teleportPacket);
} }
} }

6
nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSArmorStand.java
View File

@ -216,12 +216,12 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
private void broadcastLocationPacketNMS() { private void broadcastLocationPacketNMS() {
PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this); PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this);
for (Object humanEntity : super.world.players) { for (EntityHuman humanEntity : super.world.players) {
if (humanEntity instanceof EntityPlayer) { if (humanEntity instanceof EntityPlayer) {
EntityPlayer nmsPlayer = (EntityPlayer) humanEntity; EntityPlayer nmsPlayer = (EntityPlayer) humanEntity;
double distanceSquared = Utils.square(nmsPlayer.locX - super.locX) + Utils.square(nmsPlayer.locZ - super.locZ); double distanceSquared = Utils.distanceSquared(nmsPlayer.locX, super.locX, nmsPlayer.locZ, super.locZ);
if (distanceSquared < 8192 && nmsPlayer.playerConnection != null) { if (distanceSquared < 64 * 64 * 2 && nmsPlayer.playerConnection != null) {
nmsPlayer.playerConnection.sendPacket(teleportPacket); nmsPlayer.playerConnection.sendPacket(teleportPacket);
} }
} }

6
nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSItem.java
View File

@ -53,12 +53,12 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
// Send a packet near to "remind" players that the item is riding the armor stand (Spigot bug or client bug) // Send a packet near to "remind" players that the item is riding the armor stand (Spigot bug or client bug)
PacketPlayOutMount mountPacket = new PacketPlayOutMount(vehicle); PacketPlayOutMount mountPacket = new PacketPlayOutMount(vehicle);
for (Object humanEntity : super.world.players) { for (EntityHuman humanEntity : super.world.players) {
if (humanEntity instanceof EntityPlayer) { if (humanEntity instanceof EntityPlayer) {
EntityPlayer nmsPlayer = (EntityPlayer) humanEntity; EntityPlayer nmsPlayer = (EntityPlayer) humanEntity;
double distanceSquared = Utils.square(nmsPlayer.locX - super.locX) + Utils.square(nmsPlayer.locZ - super.locZ); double distanceSquared = Utils.distanceSquared(nmsPlayer.locX, super.locX, nmsPlayer.locZ, super.locZ);
if (distanceSquared < 1024 && nmsPlayer.playerConnection != null) { if (distanceSquared < 32 * 32 && nmsPlayer.playerConnection != null) {
nmsPlayer.playerConnection.sendPacket(mountPacket); nmsPlayer.playerConnection.sendPacket(mountPacket);
} }
} }

7
nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSSlime.java
View File

@ -12,6 +12,7 @@ import net.minecraft.server.v1_9_R1.AxisAlignedBB;
import net.minecraft.server.v1_9_R1.DamageSource; import net.minecraft.server.v1_9_R1.DamageSource;
import net.minecraft.server.v1_9_R1.Entity; import net.minecraft.server.v1_9_R1.Entity;
import net.minecraft.server.v1_9_R1.EntityDamageSource; import net.minecraft.server.v1_9_R1.EntityDamageSource;
import net.minecraft.server.v1_9_R1.EntityHuman;
import net.minecraft.server.v1_9_R1.EntityPlayer; import net.minecraft.server.v1_9_R1.EntityPlayer;
import net.minecraft.server.v1_9_R1.EntitySlime; import net.minecraft.server.v1_9_R1.EntitySlime;
import net.minecraft.server.v1_9_R1.NBTTagCompound; import net.minecraft.server.v1_9_R1.NBTTagCompound;
@ -55,12 +56,12 @@ public class EntityNMSSlime extends EntitySlime implements NMSSlime {
// Send a packet near to "remind" players that the slime is riding the armor stand (Spigot bug or client bug) // Send a packet near to "remind" players that the slime is riding the armor stand (Spigot bug or client bug)
PacketPlayOutMount mountPacket = new PacketPlayOutMount(vehicle); PacketPlayOutMount mountPacket = new PacketPlayOutMount(vehicle);
for (Object humanEntity : super.world.players) { for (EntityHuman humanEntity : super.world.players) {
if (humanEntity instanceof EntityPlayer) { if (humanEntity instanceof EntityPlayer) {
EntityPlayer nmsPlayer = (EntityPlayer) humanEntity; EntityPlayer nmsPlayer = (EntityPlayer) humanEntity;
double distanceSquared = Utils.square(nmsPlayer.locX - super.locX) + Utils.square(nmsPlayer.locZ - super.locZ); double distanceSquared = Utils.distanceSquared(nmsPlayer.locX, super.locX, nmsPlayer.locZ, super.locZ);
if (distanceSquared < 1024 && nmsPlayer.playerConnection != null) { if (distanceSquared < 32 * 32 && nmsPlayer.playerConnection != null) {
nmsPlayer.playerConnection.sendPacket(mountPacket); nmsPlayer.playerConnection.sendPacket(mountPacket);
} }
} }

6
nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSArmorStand.java
View File

@ -216,12 +216,12 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
private void broadcastLocationPacketNMS() { private void broadcastLocationPacketNMS() {
PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this); PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this);
for (Object humanEntity : super.world.players) { for (EntityHuman humanEntity : super.world.players) {
if (humanEntity instanceof EntityPlayer) { if (humanEntity instanceof EntityPlayer) {
EntityPlayer nmsPlayer = (EntityPlayer) humanEntity; EntityPlayer nmsPlayer = (EntityPlayer) humanEntity;
double distanceSquared = Utils.square(nmsPlayer.locX - super.locX) + Utils.square(nmsPlayer.locZ - super.locZ); double distanceSquared = Utils.distanceSquared(nmsPlayer.locX, super.locX, nmsPlayer.locZ, super.locZ);
if (distanceSquared < 8192 && nmsPlayer.playerConnection != null) { if (distanceSquared < 64 * 64 * 2 && nmsPlayer.playerConnection != null) {
nmsPlayer.playerConnection.sendPacket(teleportPacket); nmsPlayer.playerConnection.sendPacket(teleportPacket);
} }
} }

6
nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSItem.java
View File

@ -53,12 +53,12 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
// Send a packet near to "remind" players that the item is riding the armor stand (Spigot bug or client bug) // Send a packet near to "remind" players that the item is riding the armor stand (Spigot bug or client bug)
PacketPlayOutMount mountPacket = new PacketPlayOutMount(vehicle); PacketPlayOutMount mountPacket = new PacketPlayOutMount(vehicle);
for (Object humanEntity : super.world.players) { for (EntityHuman humanEntity : super.world.players) {
if (humanEntity instanceof EntityPlayer) { if (humanEntity instanceof EntityPlayer) {
EntityPlayer nmsPlayer = (EntityPlayer) humanEntity; EntityPlayer nmsPlayer = (EntityPlayer) humanEntity;
double distanceSquared = Utils.square(nmsPlayer.locX - super.locX) + Utils.square(nmsPlayer.locZ - super.locZ); double distanceSquared = Utils.distanceSquared(nmsPlayer.locX, super.locX, nmsPlayer.locZ, super.locZ);
if (distanceSquared < 1024 && nmsPlayer.playerConnection != null) { if (distanceSquared < 32 * 32 && nmsPlayer.playerConnection != null) {
nmsPlayer.playerConnection.sendPacket(mountPacket); nmsPlayer.playerConnection.sendPacket(mountPacket);
} }
} }

7
nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSSlime.java
View File

@ -12,6 +12,7 @@ import net.minecraft.server.v1_9_R2.AxisAlignedBB;
import net.minecraft.server.v1_9_R2.DamageSource; import net.minecraft.server.v1_9_R2.DamageSource;
import net.minecraft.server.v1_9_R2.Entity; import net.minecraft.server.v1_9_R2.Entity;
import net.minecraft.server.v1_9_R2.EntityDamageSource; import net.minecraft.server.v1_9_R2.EntityDamageSource;
import net.minecraft.server.v1_9_R2.EntityHuman;
import net.minecraft.server.v1_9_R2.EntityPlayer; import net.minecraft.server.v1_9_R2.EntityPlayer;
import net.minecraft.server.v1_9_R2.EntitySlime; import net.minecraft.server.v1_9_R2.EntitySlime;
import net.minecraft.server.v1_9_R2.NBTTagCompound; import net.minecraft.server.v1_9_R2.NBTTagCompound;
@ -55,12 +56,12 @@ public class EntityNMSSlime extends EntitySlime implements NMSSlime {
// Send a packet near to "remind" players that the slime is riding the armor stand (Spigot bug or client bug) // Send a packet near to "remind" players that the slime is riding the armor stand (Spigot bug or client bug)
PacketPlayOutMount mountPacket = new PacketPlayOutMount(vehicle); PacketPlayOutMount mountPacket = new PacketPlayOutMount(vehicle);
for (Object humanEntity : super.world.players) { for (EntityHuman humanEntity : super.world.players) {
if (humanEntity instanceof EntityPlayer) { if (humanEntity instanceof EntityPlayer) {
EntityPlayer nmsPlayer = (EntityPlayer) humanEntity; EntityPlayer nmsPlayer = (EntityPlayer) humanEntity;
double distanceSquared = Utils.square(nmsPlayer.locX - super.locX) + Utils.square(nmsPlayer.locZ - super.locZ); double distanceSquared = Utils.distanceSquared(nmsPlayer.locX, super.locX, nmsPlayer.locZ, super.locZ);
if (distanceSquared < 1024 && nmsPlayer.playerConnection != null) { if (distanceSquared < 32 * 32 && nmsPlayer.playerConnection != null) {
nmsPlayer.playerConnection.sendPacket(mountPacket); nmsPlayer.playerConnection.sendPacket(mountPacket);
} }
} }