From 8a7f40189ec2a4db0ea71dc2f5298e203aaed500 Mon Sep 17 00:00:00 2001 From: luisc Date: Mon, 22 Nov 2021 02:33:28 -0600 Subject: [PATCH] Fixed redundant function calls for saving player data in NoppesUtilServer when using isGUIOpen(). Added getServerTime() to NpcAPI. --- src/main/java/noppes/npcs/NoppesUtilServer.java | 10 +--------- src/main/java/noppes/npcs/scripted/NpcAPI.java | 2 ++ .../npcs/scripted/wrapper/WrapperNpcAPI.java | 14 ++++---------- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/main/java/noppes/npcs/NoppesUtilServer.java b/src/main/java/noppes/npcs/NoppesUtilServer.java index db38b3a9a..13b82c061 100644 --- a/src/main/java/noppes/npcs/NoppesUtilServer.java +++ b/src/main/java/noppes/npcs/NoppesUtilServer.java @@ -707,16 +707,8 @@ public class NoppesUtilServer { } public static void isGUIOpen(ByteBuf buffer, EntityPlayer player) throws IOException { - EntityPlayer pl = MinecraftServer.getServer().getConfigurationManager().func_152612_a(player.getDisplayName()); - PlayerData playerdata; - if(pl == null) - playerdata = PlayerDataController.instance.getDataFromUsername(player.getDisplayName()); - else - playerdata = PlayerDataController.instance.getPlayerData(pl); - + PlayerData playerdata = PlayerDataController.instance.getPlayerData(player); boolean isGUIOpen = buffer.readBoolean(); playerdata.setGUIOpen(isGUIOpen); - - sendPlayerData(EnumPlayerData.Players, (EntityPlayerMP)player, player.getDisplayName()); } } diff --git a/src/main/java/noppes/npcs/scripted/NpcAPI.java b/src/main/java/noppes/npcs/scripted/NpcAPI.java index b2948c564..3d49dc260 100644 --- a/src/main/java/noppes/npcs/scripted/NpcAPI.java +++ b/src/main/java/noppes/npcs/scripted/NpcAPI.java @@ -92,4 +92,6 @@ public abstract class NpcAPI { public abstract ScriptItemStack createItem(String id, int damage, int size); public abstract ScriptEntityParticle createEntityParticle(String directory); + + public abstract int getServerTime(); } diff --git a/src/main/java/noppes/npcs/scripted/wrapper/WrapperNpcAPI.java b/src/main/java/noppes/npcs/scripted/wrapper/WrapperNpcAPI.java index 23576e5f5..9bdfe6d21 100644 --- a/src/main/java/noppes/npcs/scripted/wrapper/WrapperNpcAPI.java +++ b/src/main/java/noppes/npcs/scripted/wrapper/WrapperNpcAPI.java @@ -227,12 +227,6 @@ public class WrapperNpcAPI extends NpcAPI { return arr; } - /** - * @param id The items name - * @param damage The damage value - * @param size The number of items in the item - * @return Returns the item - */ public ScriptItemStack createItem(String id, int damage, int size){ Item item = (Item)Item.itemRegistry.getObject(id); if(item == null) @@ -240,11 +234,11 @@ public class WrapperNpcAPI extends NpcAPI { return new ScriptItemStack(new ItemStack(item, size, damage)); } - /** - * @param directory The particle's texture directory. Use only forward slashes when writing a directory. Example: "customnpcs:textures/particle/tail.png" - * @return Returns ScriptEntityParticle object - */ public ScriptEntityParticle createEntityParticle(String directory){ return new ScriptEntityParticle(directory); } + + public int getServerTime() { + return MinecraftServer.getServer().getTickCounter(); + } }