EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-27 19:24:44 +02:00
Code Issues Projects Releases Wiki Activity

Because making it upper case broke all the things.

Browse Source
This commit is contained in:
GJ
2012-06-06 18:02:22 -04:00
parent 0a44a74f59
commit 2f15c71412
66 changed files with 318 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/runnables/BleedTimer.java
View File

@ -9,7 +9,7 @@ import java.util.Map.Entry;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import com.gmail.nossr50.McMMO;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.util.Combat;
@ -71,7 +71,7 @@ public class BleedTimer implements Runnable {
private void updateBleedList() {
if (lock) {
McMMO.p.getLogger().warning("mcBleedTimer attempted to update the bleedList but the list was locked!");
mcMMO.p.getLogger().warning("mcBleedTimer attempted to update the bleedList but the list was locked!");
}
else {
bleedList.keySet().removeAll(bleedRemoveList);

32
src/main/java/com/gmail/nossr50/runnables/SQLConversionTask.java
View File

@ -3,21 +3,21 @@ package com.gmail.nossr50.runnables;
import java.io.BufferedReader;
import java.io.FileReader;
import com.gmail.nossr50.McMMO;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.util.Misc;
public class SQLConversionTask implements Runnable {
private final McMMO plugin;
private final mcMMO plugin;
private String tablePrefix = Config.getInstance().getMySQLTablePrefix();
public SQLConversionTask(McMMO plugin) {
public SQLConversionTask(mcMMO plugin) {
this.plugin = plugin;
}
@Override
public void run() {
String location = McMMO.usersFile;
String location = mcMMO.usersFile;
try {
FileReader file = new FileReader(location);
@ -164,7 +164,7 @@ public class SQLConversionTask implements Runnable {
}
//Check to see if the user is in the DB
id = McMMO.database.getInt("SELECT id FROM "
id = mcMMO.database.getInt("SELECT id FROM "
+ tablePrefix
+ "users WHERE user = '" + playerName + "'");
@ -172,11 +172,11 @@ public class SQLConversionTask implements Runnable {
theCount++;
//Update the skill values
McMMO.database.write("UPDATE "
mcMMO.database.write("UPDATE "
+ tablePrefix
+ "users SET lastlogin = " + 0
+ " WHERE id = " + id);
McMMO.database.write("UPDATE "
mcMMO.database.write("UPDATE "
+ tablePrefix
+ "skills SET "
+ " taming = taming+" + Misc.getInt(taming)
@ -192,7 +192,7 @@ public class SQLConversionTask implements Runnable {
+ ", acrobatics = acrobatics+" + Misc.getInt(acrobatics)
+ ", fishing = fishing+" + Misc.getInt(fishing)
+ " WHERE user_id = " + id);
McMMO.database.write("UPDATE "
mcMMO.database.write("UPDATE "
+ tablePrefix
+ "experience SET "
+ " taming = " + Misc.getInt(tamingXP)
@ -213,32 +213,32 @@ public class SQLConversionTask implements Runnable {
theCount++;
//Create the user in the DB
McMMO.database.write("INSERT INTO "
mcMMO.database.write("INSERT INTO "
+ tablePrefix
+ "users (user, lastlogin) VALUES ('"
+ playerName + "',"
+ System.currentTimeMillis() / 1000 + ")");
id = McMMO.database.getInt("SELECT id FROM "
id = mcMMO.database.getInt("SELECT id FROM "
+ tablePrefix
+ "users WHERE user = '"
+ playerName + "'");
McMMO.database.write("INSERT INTO "
mcMMO.database.write("INSERT INTO "
+ tablePrefix
+ "skills (user_id) VALUES (" + id + ")");
McMMO.database.write("INSERT INTO "
mcMMO.database.write("INSERT INTO "
+ tablePrefix
+ "experience (user_id) VALUES (" + id
+ ")");
//Update the skill values
McMMO.database.write("UPDATE "
mcMMO.database.write("UPDATE "
+ tablePrefix
+ "users SET lastlogin = " + 0
+ " WHERE id = " + id);
McMMO.database.write("UPDATE "
mcMMO.database.write("UPDATE "
+ tablePrefix
+ "users SET party = '" + party
+ "' WHERE id = " + id);
McMMO.database.write("UPDATE "
mcMMO.database.write("UPDATE "
+ tablePrefix
+ "skills SET "
+ " taming = taming+" + Misc.getInt(taming)
@ -254,7 +254,7 @@ public class SQLConversionTask implements Runnable {
+ ", acrobatics = acrobatics+" + Misc.getInt(acrobatics)
+ ", fishing = fishing+" + Misc.getInt(fishing)
+ " WHERE user_id = " + id);
McMMO.database.write("UPDATE "
mcMMO.database.write("UPDATE "
+ tablePrefix
+ "experience SET "
+ " taming = " + Misc.getInt(tamingXP)

6
src/main/java/com/gmail/nossr50/runnables/SQLReconnect.java
View File

@ -2,15 +2,15 @@ package com.gmail.nossr50.runnables;
import org.bukkit.entity.Player;
import com.gmail.nossr50.McMMO;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.util.Database;
import com.gmail.nossr50.util.Users;
public class SQLReconnect implements Runnable {
private final McMMO plugin;
private final mcMMO plugin;
public SQLReconnect(McMMO plugin) {
public SQLReconnect(mcMMO plugin) {
this.plugin = plugin;
}

6
src/main/java/com/gmail/nossr50/runnables/SaveTimer.java
View File

@ -2,12 +2,12 @@ package com.gmail.nossr50.runnables;
import org.bukkit.entity.Player;
import com.gmail.nossr50.McMMO;
import com.gmail.nossr50.mcMMO;
public class SaveTimer implements Runnable {
private final McMMO plugin;
private final mcMMO plugin;
public SaveTimer(final McMMO plugin) {
public SaveTimer(final mcMMO plugin) {
this.plugin = plugin;
}

6
src/main/java/com/gmail/nossr50/runnables/SkillMonitor.java
View File

@ -2,7 +2,7 @@ package com.gmail.nossr50.runnables;
import org.bukkit.entity.Player;
import com.gmail.nossr50.McMMO;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.datatypes.AbilityType;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
@ -10,9 +10,9 @@ import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
public class SkillMonitor implements Runnable {
private final McMMO plugin;
private final mcMMO plugin;
public SkillMonitor(final McMMO plugin) {
public SkillMonitor(final mcMMO plugin) {
this.plugin = plugin;
}

12
src/main/java/com/gmail/nossr50/runnables/SpoutStart.java
View File

@ -3,28 +3,28 @@ package com.gmail.nossr50.runnables;
import org.getspout.spoutapi.SpoutManager;
import org.getspout.spoutapi.player.FileManager;
import com.gmail.nossr50.McMMO;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.SpoutConfig;
import com.gmail.nossr50.spout.SpoutStuff;
public class SpoutStart implements Runnable{
private final McMMO plugin;
private final mcMMO plugin;
public SpoutStart(final McMMO plugin) {
public SpoutStart(final mcMMO plugin) {
this.plugin = plugin;
}
@Override
public void run() {
if (plugin.getServer().getPluginManager().getPlugin("Spout") != null) {
McMMO.spoutEnabled = true;
mcMMO.spoutEnabled = true;
}
else {
McMMO.spoutEnabled = false;
mcMMO.spoutEnabled = false;
}
//Spout Stuff
if (McMMO.spoutEnabled) {
if (mcMMO.spoutEnabled) {
SpoutConfig.getInstance();
SpoutStuff.setupSpoutConfigs();
SpoutStuff.registerCustomEvent();