diff --git a/src/de/warking/hunjy/MySQL/BauweltMember.java b/src/de/warking/hunjy/MySQL/BauweltMember.java index 263e0fd..01252e0 100644 --- a/src/de/warking/hunjy/MySQL/BauweltMember.java +++ b/src/de/warking/hunjy/MySQL/BauweltMember.java @@ -36,8 +36,13 @@ public class BauweltMember{ this(bauweltID, memberID, build, changeGM, teleport, worldEdit, testblock, true); } + public BauweltMember(UUID bauweltID, UUID memberID, boolean build, boolean changeGM, boolean teleport, boolean worldEdit, boolean testblock){ + this(WarkingUser.get(bauweltID).getId(), WarkingUser.get(memberID).getId(), build, changeGM, teleport, worldEdit, testblock, true); + } + public void remove(){ - sql.update("DELETE FROM BauweltMember WHERE BauweltID = ? AND MemberID = ?"); + sql.update("DELETE FROM BauweltMember WHERE BauweltID = " + BauweltID + " AND MemberID = " + MemberID); + memberCache.remove(this); } private void updateDB(){ diff --git a/src/de/warking/hunjy/MySQL/WarkingUser.java b/src/de/warking/hunjy/MySQL/WarkingUser.java index c2c5360..3e4bb33 100644 --- a/src/de/warking/hunjy/MySQL/WarkingUser.java +++ b/src/de/warking/hunjy/MySQL/WarkingUser.java @@ -1,7 +1,5 @@ package de.warking.hunjy.MySQL; -import org.bukkit.entity.Player; - import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; @@ -30,7 +28,7 @@ public class WarkingUser { } public WarkingUser(String name){ - ResultSet dbplayer = sql.select("SELECT * FROM UserData WHERE UserName = '" + name + "'"); + ResultSet dbplayer = sql.select("SELECT * FROM UserData WHERE lower(UserName) = '" + name.toLowerCase() + "'"); init(dbplayer); } @@ -65,7 +63,7 @@ public class WarkingUser { public static WarkingUser get(String userName){ for(WarkingUser user : allUsers) - if(user.UserName.equals(userName)) + if(user.UserName.equalsIgnoreCase(userName)) return user; WarkingUser offline = new WarkingUser(userName); allUsers.remove(offline);