Netherite-Public/ZNPCsPlus
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

make unsafe method names consistent

Browse source
This commit is contained in:
Pyrbu 2023-05-21 12:59:21 +01:00
parent 03159ce964
commit 3d9ca60445
3 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugin/src/main/java/lol/pyr/znpcsplus/hologram/HologramImpl.java
View file

@ -60,12 +60,12 @@ public class HologramImpl extends Viewable implements Hologram {
} }
@Override @Override
protected void _show(Player player) { protected void UNSAFE_show(Player player) {
for (HologramLine line : lines) line.show(player); for (HologramLine line : lines) line.show(player);
} }
@Override @Override
protected void _hide(Player player) { protected void UNSAFE_hide(Player player) {
for (HologramLine line : lines) line.hide(player); for (HologramLine line : lines) line.hide(player);
} }

16
plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcImpl.java
View file

@ -84,22 +84,22 @@ public class NpcImpl extends Viewable implements Npc {
} }
@Override @Override
protected void _show(Player player) { protected void UNSAFE_show(Player player) {
entity.spawn(player); entity.spawn(player);
hologram.show(player); hologram.show(player);
} }
@Override @Override
protected void _hide(Player player) { protected void UNSAFE_hide(Player player) {
entity.despawn(player); entity.despawn(player);
hologram.hide(player); hologram.hide(player);
} }
private void _refreshMeta() { private void UNSAFE_refreshMeta() {
for (Player viewer : getViewers()) entity.refreshMeta(viewer); for (Player viewer : getViewers()) entity.refreshMeta(viewer);
} }
private void _remakeTeam() { private void UNSAFE_remakeTeam() {
for (Player viewer : getViewers()) entity.remakeTeam(viewer); for (Player viewer : getViewers()) entity.remakeTeam(viewer);
} }
@ -116,8 +116,8 @@ public class NpcImpl extends Viewable implements Npc {
if (value == null) return; if (value == null) return;
if (value.equals(key.getDefaultValue())) removeProperty(key); if (value.equals(key.getDefaultValue())) removeProperty(key);
else propertyMap.put(key, value); else propertyMap.put(key, value);
_refreshMeta(); UNSAFE_refreshMeta();
if (key == EntityPropertyImpl.GLOW) _remakeTeam(); if (key == EntityPropertyImpl.GLOW) UNSAFE_remakeTeam();
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@ -127,8 +127,8 @@ public class NpcImpl extends Viewable implements Npc {
public void removeProperty(EntityPropertyImpl<?> key) { public void removeProperty(EntityPropertyImpl<?> key) {
propertyMap.remove(key); propertyMap.remove(key);
_refreshMeta(); UNSAFE_refreshMeta();
if (key == EntityPropertyImpl.GLOW) _remakeTeam(); if (key == EntityPropertyImpl.GLOW) UNSAFE_remakeTeam();
} }
public Set<EntityPropertyImpl<?>> getAppliedProperties() { public Set<EntityPropertyImpl<?>> getAppliedProperties() {

16
plugin/src/main/java/lol/pyr/znpcsplus/util/Viewable.java
View file

@ -21,19 +21,19 @@ public abstract class Viewable {
public void respawn(Player player) { public void respawn(Player player) {
if (!viewers.contains(player)) return; if (!viewers.contains(player)) return;
_hide(player); UNSAFE_hide(player);
_show(player); UNSAFE_show(player);
} }
public void show(Player player) { public void show(Player player) {
if (viewers.contains(player)) return; if (viewers.contains(player)) return;
_show(player); UNSAFE_show(player);
viewers.add(player); viewers.add(player);
} }
public void hide(Player player) { public void hide(Player player) {
if (!viewers.contains(player)) return; if (!viewers.contains(player)) return;
_hide(player); UNSAFE_hide(player);
viewers.remove(player); viewers.remove(player);
} }
@ -42,11 +42,11 @@ public abstract class Viewable {
} }
protected void UNSAFE_hideAll() { protected void UNSAFE_hideAll() {
for (Player viewer : viewers) _hide(viewer); for (Player viewer : viewers) UNSAFE_hide(viewer);
} }
protected void UNSAFE_showAll() { protected void UNSAFE_showAll() {
for (Player viewer : viewers) _show(viewer); for (Player viewer : viewers) UNSAFE_show(viewer);
} }
public Set<Player> getViewers() { public Set<Player> getViewers() {
@ -57,7 +57,7 @@ public abstract class Viewable {
return viewers.contains(player); return viewers.contains(player);
} }
protected abstract void _show(Player player); protected abstract void UNSAFE_show(Player player);
protected abstract void _hide(Player player); protected abstract void UNSAFE_hide(Player player);
} }