Workaround for offline mode

ericyoondotcom · Dec 2, 2020 · c179833 · c179833
1 parent 4dd9f69
commit c179833
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 6 deletions.
diff --git a/MinecraftManhunt/pom.xml b/MinecraftManhunt/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.yoonicode</groupId>
     <artifactId>MinecraftManhunt</artifactId>
-    <version>1.3.3.3</version>
+    <version>1.3.3.4</version>
 
     <build>
         <plugins>

diff --git a/MinecraftManhunt/src/main/java/com/yoonicode/minecraftmanhunt/PluginCommands.java b/MinecraftManhunt/src/main/java/com/yoonicode/minecraftmanhunt/PluginCommands.java
@@ -313,6 +313,7 @@ public void run() {
                     .add("num_hunters", main.hunters.size())
                     .add("num_runners", main.runners.size())
                     .add("num_spectators", main.spectators.size())
+                    .add("headstart_duration", headStartDuration)
                     .add("discord_enabled", main.discord.enabled)
                     .add("plugin_version", main.getDescription().getVersion())
                     .add("server_version", Bukkit.getBukkitVersion());

diff --git a/MinecraftManhunt/src/main/java/com/yoonicode/minecraftmanhunt/PluginListener.java b/MinecraftManhunt/src/main/java/com/yoonicode/minecraftmanhunt/PluginListener.java
@@ -65,7 +65,7 @@ public void onInventoryClick(InventoryClickEvent event) {
                 return;
             }
 
-            if(clickedHead.getType() != Material.PLAYER_HEAD){
+            if(clickedHead == null || clickedHead.getType() != Material.PLAYER_HEAD){
                 main.logger.warning("Item clicked is not player head.");
                 event.setCancelled(true);
                 return;
@@ -86,10 +86,15 @@ public void onInventoryClick(InventoryClickEvent event) {
             }
             SkullMeta meta = (SkullMeta)itemmeta;
             OfflinePlayer target = meta.getOwningPlayer();
-            main.targets.put(hunter.getName(), target.getName());
+            String targetName = target.getName();
+            if(targetName == null){
+                targetName = meta.getDisplayName();
+                main.logger.info("Target name is null, applying offline mode workaround. Using item display name: " + targetName);
+            }
+            main.targets.put(hunter.getName(), targetName);
             event.setCancelled(true);
             hunter.closeInventory();
-            hunter.sendMessage("Compass is now targeting " + target.getName());
+            hunter.sendMessage("Compass is now targeting " + targetName);
         }
     }
 

diff --git a/MinecraftManhunt/src/main/java/com/yoonicode/minecraftmanhunt/TrackManager.java b/MinecraftManhunt/src/main/java/com/yoonicode/minecraftmanhunt/TrackManager.java
@@ -24,6 +24,8 @@
 import org.bukkit.event.vehicle.VehicleEnterEvent;
 import org.bukkit.inventory.ItemStack;
 
+import javax.json.Json;
+import javax.json.JsonObjectBuilder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -211,6 +213,10 @@ public String parseCommand(String argument){
 
         autoEnabled = false;
         playTrack(argument.toLowerCase());
+
+        JsonObjectBuilder eventParams = Json.createObjectBuilder()
+                .add("track", argument.toLowerCase());
+        main.analytics.sendEvent("manual_track_played", eventParams);
         return "Playing track " + argument;
     }
 
@@ -299,7 +305,13 @@ public void playDangerLevelTrack(){
                 break;
         }
         int random = (int)(Math.random() * candidates.size());
-        playTrack(candidates.get(random));
+        String chosen = candidates.get(random);
+        playTrack(chosen);
+
+        JsonObjectBuilder eventParams = Json.createObjectBuilder()
+                .add("danger_level", dangerLevel.toString())
+                .add("track", chosen);
+        main.analytics.sendEvent("danger_level_track_played", eventParams);
     }
 
     public void updateDangerLevel(){
@@ -362,6 +374,10 @@ public void playSpecialTrack(String trackName, boolean override){
 
         specialPlaying = true;
         playTrack(trackName);
+
+        JsonObjectBuilder eventParams = Json.createObjectBuilder()
+                .add("track", trackName);
+        main.analytics.sendEvent("special_track_played", eventParams);
     }
 
     public void playSpecialTrack(String trackName){

diff --git a/MinecraftManhunt/src/main/resources/plugin.yml b/MinecraftManhunt/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: MinecraftManhunt
-version: 1.3.3.3
+version: 1.3.3.4
 main: com.yoonicode.minecraftmanhunt.PluginMain
 api-version: 1.16
 commands: