sorceress
/
EasyAuth
1
0
Fork 1
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Resolving merge conflicts

This commit is contained in:
samo_lego 2020-11-06 12:20:17 +01:00
parent 2f7d4d5568
commit d198a67346
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/samo_lego/simpleauth/SimpleAuth.java
View File

@ -20,6 +20,7 @@ import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.Properties; import java.util.Properties;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;

11
src/main/java/org/samo_lego/simpleauth/storage/PlayerCache.java
View File

@ -1,14 +1,11 @@
package org.samo_lego.simpleauth.storage; package org.samo_lego.simpleauth.storage;
import com.google.gson.*; import com.google.gson.Gson;
import com.google.gson.JsonObject;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld; import net.minecraft.server.world.ServerWorld;
import net.minecraft.text.LiteralText;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import net.minecraft.util.registry.Registry;
import net.minecraft.util.registry.RegistryKey;
import java.util.Objects; import java.util.Objects;
@ -121,8 +118,6 @@ public class PlayerCache {
playerCache.lastIp = player.getIp(); playerCache.lastIp = player.getIp();
playerCache.wasInPortal = player.getBlockState().getBlock().equals(Blocks.NETHER_PORTAL); playerCache.wasInPortal = player.getBlockState().getBlock().equals(Blocks.NETHER_PORTAL);
playerCache.lastAir = player.getAir();
playerCache.wasOnFire = player.isOnFire();
// Setting position cache // Setting position cache
playerCache.lastLocation.dimension = player.getServerWorld(); playerCache.lastLocation.dimension = player.getServerWorld();
@ -132,8 +127,6 @@ public class PlayerCache {
} }
else { else {
playerCache.wasInPortal = false; playerCache.wasInPortal = false;
playerCache.lastAir = 300;
playerCache.wasOnFire = false;
} }
return playerCache; return playerCache;

4
src/main/java/org/samo_lego/simpleauth/storage/database/LevelDB.java
View File

@ -64,7 +64,7 @@ public class LevelDB {
* @return true if operation was successful, otherwise false * @return true if operation was successful, otherwise false
*/ */
@Deprecated @Deprecated
public boolean registerUser(String uuid, String data) { public static boolean registerUser(String uuid, String data) {
try { try {
if(!isUserRegistered(uuid)) { if(!isUserRegistered(uuid)) {
levelDBStore.put(bytes("UUID:" + uuid), bytes("data:" + data)); levelDBStore.put(bytes("UUID:" + uuid), bytes("data:" + data));
@ -112,7 +112,7 @@ public class LevelDB {
* @param data data to put inside database * @param data data to put inside database
*/ */
@Deprecated @Deprecated
public void updateUserData(String uuid, String data) { public static void updateUserData(String uuid, String data) {
try { try {
levelDBStore.put(bytes("UUID:" + uuid), bytes("data:" + data)); levelDBStore.put(bytes("UUID:" + uuid), bytes("data:" + data));
} catch (Error e) { } catch (Error e) {

1
src/main/java/org/samo_lego/simpleauth/storage/database/MongoDB.java
View File

@ -32,6 +32,7 @@ public class MongoDB {
config.mongoDBCredentials.useSsl config.mongoDBCredentials.useSsl
) )
playerCache.wasOnFire = false;
);*/ );*/
mongoClient = MongoClients.create(String.format("mongodb://%s:%d", config.mongoDBCredentials.host, config.mongoDBCredentials.port)); mongoClient = MongoClients.create(String.format("mongodb://%s:%d", config.mongoDBCredentials.host, config.mongoDBCredentials.port));
MongoDatabase database = mongoClient.getDatabase(config.mongoDBCredentials.databaseName); MongoDatabase database = mongoClient.getDatabase(config.mongoDBCredentials.databaseName);