Merge pull request #3 from JavaJava19/develop

Develop

Author: Elic0de

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.elic0de</groupId>
     <artifactId>thejpspit</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>2</version>
     <packaging>jar</packaging>
 
     <name>TheJpsPit</name>

src/main/java/com/github/elic0de/thejpspit/TheJpsPit.java

@@ -90,7 +90,6 @@ public void onEnable() {
             }
 
             PitPlayerManager.registerUser(pitPlayer);
-            game.join(pitPlayer);
             if (updateNeeded) {
                 database.updateUserData(pitPlayer);
             }

src/main/java/com/github/elic0de/thejpspit/listener/EventListener.java

@@ -51,7 +51,6 @@ public void onJoin(PlayerJoinEvent event) {
         }
 
         PitPlayerManager.registerUser(pitPlayer);
-        plugin.getGame().join(pitPlayer);
         if (updateNeeded) {
             plugin.getDatabase().updateUserData(pitPlayer);
         }
@@ -68,16 +67,6 @@ public void onQuit(PlayerQuitEvent event) {
         }
     }
 
-    @EventHandler
-    public void onBlockPlace(BlockPlaceEvent event) {
-        event.setCancelled(true);
-    }
-
-    @EventHandler
-    public void onBlockBreak(BlockBreakEvent event) {
-        PitPlayerManager.getPitPlayer(event.getPlayer()).increaseXP();
-        event.setCancelled(true);
-    }
 
     @EventHandler
     public void onHungerChange(FoodLevelChangeEvent event) {
@@ -109,8 +98,8 @@ public void onFallDamage(EntityDamageEvent event) {
     @EventHandler
     public void onDamage(EntityDamageByEntityEvent event) {
         if (event.getEntity() instanceof Player vitim) {
-            if (event.getDamager() instanceof Player) {
-                final PitPlayer pitPlayer = PitPlayerManager.getPitPlayer(vitim);
+            if (event.getDamager() instanceof Player damager) {
+                final PitPlayer pitPlayer = PitPlayerManager.getPitPlayer(damager);
                 if (event.getCause() == EntityDamageEvent.DamageCause.FALL) {
                     event.setCancelled(true);
                     return;

src/main/java/com/github/elic0de/thejpspit/player/PitPlayerManager.java

@@ -1,5 +1,6 @@
 package com.github.elic0de.thejpspit.player;
 
+import com.github.elic0de.thejpspit.TheJpsPit;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -10,6 +11,7 @@ public class PitPlayerManager {
     private static final Map<UUID, PitPlayer> pitPlayerMap = new HashMap<>();
 
     public static void registerUser(PitPlayer player) {
+        TheJpsPit.getInstance().getGame().join(player);
         pitPlayerMap.put(player.getUniqueId(), player);
     }
 

src/main/java/com/github/elic0de/thejpspit/util/KillRatingHelper.java

@@ -7,7 +7,7 @@
 public class KillRatingHelper {
 
     // 少数第二で四捨五入
-    private static final double roundingFactor = 10000;
+    private static final double roundingFactor = 1000000;
     private final double defaultRating;
 
     public KillRatingHelper(double defaultRating) {

src/main/java/com/github/elic0de/thejpspit/util/ShowHealth.java

@@ -10,7 +10,7 @@ public class ShowHealth {
 
     public static void showHealth(PitPlayer pitPlayer, PitPlayer targetPit) {
         Player target = targetPit.getPlayer();
-        double maxHealth = target.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue();
+        double maxHealth = target.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue();
         double health = target.getHealth() - target.getLastDamage();
 
         if (health < 0.0 || target.isDead()) {