Use get directly and check for null

Saves one hash table lookup
GufliMC · Aug 5, 2024 · 85afa00 · 85afa00
1 parent e4e19f8
commit 85afa00
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/bukkit/src/main/java/com/gufli/kingdomcraft/bukkit/listeners/FriendlyFireListener.java b/bukkit/src/main/java/com/gufli/kingdomcraft/bukkit/listeners/FriendlyFireListener.java
@@ -137,9 +137,9 @@ private <T extends Cancellable> void handleEvent(T e, Entity entity, Entity dama
             damager.remove();
         }
 
-        long lastNotification = 0;
-        if ( d.has("LAST_FRIENDLYFIRE_NOTIFICATION") ) {
-            lastNotification = d.get("LAST_FRIENDLYFIRE_NOTIFICATION", Long.class);
+        Long lastNotification = d.get("LAST_FRIENDLYFIRE_NOTIFICATION", Long.class);
+        if ( lastNotification == null ) {
+            lastNotification = 0L;
         }
 
         if ( System.currentTimeMillis() - lastNotification > 5000 ) {

diff --git a/bukkit/src/main/java/com/gufli/kingdomcraft/bukkit/listeners/PermissionsListener.java b/bukkit/src/main/java/com/gufli/kingdomcraft/bukkit/listeners/PermissionsListener.java
@@ -101,11 +101,11 @@ public void onReload(PluginReloadEvent e) {
     //
 
     void clear(PlatformPlayer player) {
-        if ( !player.has(PERMISSIONS_KEY) ) {
+        PermissionAttachment pa = player.get(PERMISSIONS_KEY, PermissionAttachment.class);
+        if ( pa == null ) {
             return;
         }
 
-        PermissionAttachment pa = player.get(PERMISSIONS_KEY, PermissionAttachment.class);
         Player p = ((BukkitPlayer) player).getPlayer();
         p.removeAttachment(pa);
     }

diff --git a/bukkit/src/main/java/com/gufli/kingdomcraft/bukkit/menu/MenuChatListener.java b/bukkit/src/main/java/com/gufli/kingdomcraft/bukkit/menu/MenuChatListener.java
@@ -38,14 +38,14 @@ public MenuChatListener(KingdomCraftBukkitPlugin plugin) {
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
     public void onChat(AsyncPlayerChatEvent event) {
         PlatformPlayer player = plugin.getKdc().getPlayer(event.getPlayer().getUniqueId());
+        Consumer<String> c = (Consumer<String>)player.get("MENU_CHAT_CALLBACK", Consumer.class);
 
-        if ( !player.has("MENU_CHAT_CALLBACK") ) {
+        if ( c == null ) {
             return;
         }
 
         event.setCancelled(true);
 
-        Consumer c = player.get("MENU_CHAT_CALLBACK", Consumer.class);
         player.remove("MENU_CHAT_CALLBACK");
 
         if ( !event.getMessage().equalsIgnoreCase("cancel") ) {
@@ -59,11 +59,12 @@ public void onChat(AsyncPlayerChatEvent event) {
 
         player.sendMessage(ChatColor.GREEN + "Cancelled!");
 
-        if ( !player.has("MENU_CHAT_CANCEL") ) {
+        Runnable r =  player.get("MENU_CHAT_CANCEL", Runnable.class);
+
+        if ( r == null ) {
             return;
         }
 
-        Runnable r =  player.get("MENU_CHAT_CANCEL", Runnable.class);
         plugin.getScheduler().sync().execute(() -> r.run());
 
         player.remove("MENU_CHAT_CANCEL");