Skip to content

Commit

Permalink
Close #5
Browse files Browse the repository at this point in the history
  • Loading branch information
CatCore committed Aug 14, 2020
1 parent 62762c8 commit cb646de
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '0.5-SNAPSHOT'
id 'fabric-loom' version '0.5.1'
id 'maven-publish'
}

Expand All @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/fr/catcore/deacoudre/game/DeACoudreActive.java
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"fabricloader": ">=0.9.1",
"fabric": "*",
"minecraft": "1.16.2",
"plasmid": ">=0.1.0"
"plasmid": ">=0.2.0"
}
}

0 comments on commit cb646de

Please sign in to comment.