summaryrefslogtreewikicommitdiff
path: root/src/main/java/net/tylermurphy/hideAndSeek/database
diff options
context:
space:
mode:
authorTyler Murphy <tylermurphy534@gmail.com>2022-11-26 14:23:39 -0500
committerTyler Murphy <tylermurphy534@gmail.com>2022-11-26 14:23:39 -0500
commit6b453dde9758bc6d4d399528209addc2b817ce1a (patch)
tree3172b2afa630621a22cc65426f6b932b1b0f912f /src/main/java/net/tylermurphy/hideAndSeek/database
parentfix seeker/hider returning null (diff)
downloadkenshinshideandseek-6b453dde9758bc6d4d399528209addc2b817ce1a.tar.gz
kenshinshideandseek-6b453dde9758bc6d4d399528209addc2b817ce1a.tar.bz2
kenshinshideandseek-6b453dde9758bc6d4d399528209addc2b817ce1a.zip
1.7.0RC1
Diffstat (limited to 'src/main/java/net/tylermurphy/hideAndSeek/database')
-rw-r--r--src/main/java/net/tylermurphy/hideAndSeek/database/Database.java19
-rw-r--r--src/main/java/net/tylermurphy/hideAndSeek/database/GameDataTable.java16
2 files changed, 8 insertions, 27 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/Database.java b/src/main/java/net/tylermurphy/hideAndSeek/database/Database.java
index d2fb40d..dca2de0 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/database/Database.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/database/Database.java
@@ -1,22 +1,3 @@
-/*
- * This file is part of Kenshins Hide and Seek
- *
- * Copyright (c) 2021 Tyler Murphy.
- *
- * Kenshins Hide and Seek free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * he Free Software Foundation version 3.
- *
- * Kenshins Hide and Seek is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
package net.tylermurphy.hideAndSeek.database;
import com.google.common.io.ByteStreams;
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/GameDataTable.java b/src/main/java/net/tylermurphy/hideAndSeek/database/GameDataTable.java
index 8f0ddde..c01f615 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/database/GameDataTable.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/database/GameDataTable.java
@@ -175,10 +175,10 @@ public class GameDataTable {
@NotNull Board board,
@NotNull List<UUID> uuids,
@NotNull List<UUID> winners,
- @NotNull Map<String,Integer> hider_kills,
- @NotNull Map<String,Integer> hider_deaths,
- @NotNull Map<String,Integer> seeker_kills,
- @NotNull Map<String,Integer> seeker_deaths,
+ @NotNull Map<UUID,Integer> hider_kills,
+ @NotNull Map<UUID,Integer> hider_deaths,
+ @NotNull Map<UUID,Integer> seeker_kills,
+ @NotNull Map<UUID,Integer> seeker_deaths,
@NotNull WinType type
) {
for(UUID uuid : uuids) {
@@ -192,10 +192,10 @@ public class GameDataTable {
info.getSeekerWins() + (winners.contains(uuid) && type == WinType.SEEKER_WIN ? 1 : 0),
info.getHiderGames() + (board.isHider(uuid) || (board.isSeeker(uuid) && !board.getFirstSeeker().getUniqueId().equals(uuid)) ? 1 : 0),
info.getSeekerGames() + (board.getFirstSeeker().getUniqueId().equals(uuid) ? 1 : 0),
- info.getHiderKills() + hider_kills.getOrDefault(uuid.toString(), 0),
- info.getSeekerKills() + seeker_kills.getOrDefault(uuid.toString(), 0),
- info.getHiderDeaths() + hider_deaths.getOrDefault(uuid.toString(), 0),
- info.getSeekerDeaths() + seeker_deaths.getOrDefault(uuid.toString(), 0)
+ info.getHiderKills() + hider_kills.getOrDefault(uuid, 0),
+ info.getSeekerKills() + seeker_kills.getOrDefault(uuid, 0),
+ info.getHiderDeaths() + hider_deaths.getOrDefault(uuid, 0),
+ info.getSeekerDeaths() + seeker_deaths.getOrDefault(uuid, 0)
);
}
}