From cb646de08aed96b519fa9e4f51f310eec264b6bd Mon Sep 17 00:00:00 2001
From: CatCore <arthur.bambou@gmail.com>
Date: Fri, 14 Aug 2020 18:40:04 +0200
Subject: [PATCH] Close #5

---
 build.gradle                                                 | 4 ++--
 gradle.properties                                            | 2 +-
 src/main/java/fr/catcore/deacoudre/game/DeACoudreActive.java | 4 ++--
 src/main/resources/fabric.mod.json                           | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 753461c..07d5076 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '0.5-SNAPSHOT'
+    id 'fabric-loom' version '0.5.1'
     id 'maven-publish'
 }
 
@@ -26,7 +26,7 @@ dependencies {
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
     // Plasmid
-    modImplementation "xyz.nucleoid:plasmid:0.1.0+build.72"
+    modImplementation "xyz.nucleoid:plasmid:0.2.3"
 
 //    modRuntime ("com.github.jellysquid3:sodium-fabric:b9c2ad3c38b16275cf2f1a81dcfb2fee1563905b")
 //    modRuntime ("com.github.jellysquid3:phosphor-fabric:0749029a498e8f6574643285bae7aecb2eda76b8")
diff --git a/gradle.properties b/gradle.properties
index d846612..48303bb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@ minecraft_version=1.16.2
 yarn_mappings=1.16.2+build.6
 loader_version=0.9.1+build.205
 # Mod Properties
-mod_version=1.1.11
+mod_version=1.1.12
 maven_group=fr.catcore
 archives_base_name=deacoudre
 # Dependencies
diff --git a/src/main/java/fr/catcore/deacoudre/game/DeACoudreActive.java b/src/main/java/fr/catcore/deacoudre/game/DeACoudreActive.java
index 73b2f4a..8c674e6 100644
--- a/src/main/java/fr/catcore/deacoudre/game/DeACoudreActive.java
+++ b/src/main/java/fr/catcore/deacoudre/game/DeACoudreActive.java
@@ -132,7 +132,7 @@ private void addPlayer(ServerPlayerEntity player) {
 
     private boolean onPlayerDamage(ServerPlayerEntity player, DamageSource source, float amount) {
         if (player == null) return true;
-        if (!this.singleplayer && PlayerRef.of(player) != this.nextJumper) return true;
+        if (!this.singleplayer && !PlayerRef.of(player).equals(this.nextJumper)) return true;
 
         Vec3d playerPos = player.getPos();
         BlockBounds poolBounds = this.gameMap.getTemplate().getFirstRegion("pool");
@@ -174,7 +174,7 @@ private void eliminatePlayer(ServerPlayerEntity player) {
         this.spawnSpectator(player);
         PlayerRef eliminated = PlayerRef.of(player);
         for (PlayerRef playerRef : this.participants) {
-            if (playerRef == eliminated) {
+            if (playerRef.equals(eliminated)) {
                 eliminated = playerRef;
                 break;
             }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 0fd3c29..15d7d30 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -23,6 +23,6 @@
     "fabricloader": ">=0.9.1",
     "fabric": "*",
     "minecraft": "1.16.2",
-    "plasmid": ">=0.1.0"
+    "plasmid": ">=0.2.0"
   }
 }