EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 07:06:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into locale

Browse Source
This commit is contained in:
GJ 2012-04-19 23:32:32 -04:00
commit ea350c30c8
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -20,6 +20,7 @@ Version 1.3.06-dev
= Fixed bug with Nether Wart not awarding XP = Fixed bug with Nether Wart not awarding XP
= Fixed bug with fishing treasures when treasures list is empty = Fixed bug with fishing treasures when treasures list is empty
= Fixed bug with only getting one level when there was enough XP for multiple levels. = Fixed bug with only getting one level when there was enough XP for multiple levels.
! Changed mcremove to check for users in the MySQL DB before sending queries to remove them
! Changed how the tree feller threshold worked for the better ! Changed how the tree feller threshold worked for the better
! Changed /mcremove to no longer kick players when they are removed from database ! Changed /mcremove to no longer kick players when they are removed from database
! Changed /mcremove to work on offline users for FlatFile ! Changed /mcremove to work on offline users for FlatFile

7
src/main/java/com/gmail/nossr50/commands/mc/McremoveCommand.java
View File

@ -44,8 +44,10 @@ public class McremoveCommand implements CommandExecutor {
//If the server is using MySQL //If the server is using MySQL
if(LoadProperties.useMySQL) if(LoadProperties.useMySQL)
{ {
int userId = mcMMO.database.getInt("SELECT id FROM "+LoadProperties.MySQLtablePrefix+"users WHERE user = '" + playerName + "'"); int userId = 0;
userId = mcMMO.database.getInt("SELECT id FROM "+LoadProperties.MySQLtablePrefix+"users WHERE user = '" + playerName + "'");
if(userId > 0) {
//Remove user from tables //Remove user from tables
mcMMO.database.write("DELETE FROM " mcMMO.database.write("DELETE FROM "
+LoadProperties.MySQLdbName+"." +LoadProperties.MySQLdbName+"."
@ -73,6 +75,9 @@ public class McremoveCommand implements CommandExecutor {
+LoadProperties.MySQLtablePrefix+"experience.user_id="+userId); +LoadProperties.MySQLtablePrefix+"experience.user_id="+userId);
sender.sendMessage("User "+playerName+" removed from MySQL DB!"); //TODO: Needs more locale. sender.sendMessage("User "+playerName+" removed from MySQL DB!"); //TODO: Needs more locale.
} else {
sender.sendMessage("Unable to find player named "+playerName+" in the database!");
}
} else { } else {
if(removeFlatFileUser(playerName)) { if(removeFlatFileUser(playerName)) {
sender.sendMessage(ChatColor.GREEN+"[mcMMO] It worked! User was removed."); sender.sendMessage(ChatColor.GREEN+"[mcMMO] It worked! User was removed.");