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

Merge branch 'master' of github.com:nossr50/vminecraft-plugin

Browse Source
This commit is contained in:
cerevisiae 2010-12-07 22:19:38 -06:00
commit d65252d289
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vMinecraft.java
View File

@ -28,6 +28,7 @@ public class vMinecraft extends Plugin {
etc.getLoader().addListener(PluginLoader.Hook.IGNITE, listener, this, PluginListener.Priority.HIGH); etc.getLoader().addListener(PluginLoader.Hook.IGNITE, listener, this, PluginListener.Priority.HIGH);
etc.getLoader().addListener(PluginLoader.Hook.DAMAGE, listener, this, PluginListener.Priority.MEDIUM); etc.getLoader().addListener(PluginLoader.Hook.DAMAGE, listener, this, PluginListener.Priority.MEDIUM);
etc.getLoader().addListener(PluginLoader.Hook.EXPLODE, listener, this, PluginListener.Priority.HIGH); etc.getLoader().addListener(PluginLoader.Hook.EXPLODE, listener, this, PluginListener.Priority.HIGH);
etc.getLoader().addListener(PluginLoader.Hook.LIQUID_DESTROY, listener, this, PluginListener.Priority.MEDIUM);
etc.getLoader().addListener(PluginLoader.Hook.HEALTH_CHANGE, listener, this, PluginListener.Priority.MEDIUM); etc.getLoader().addListener(PluginLoader.Hook.HEALTH_CHANGE, listener, this, PluginListener.Priority.MEDIUM);
} }
} }

5
vMinecraftCommands.java
View File

@ -585,8 +585,9 @@ public class vMinecraftCommands{
public static int modifySplit(Player player, String[] args) public static int modifySplit(Player player, String[] args)
{ {
//Exploit fix for people giving themselves commands //Exploit fix for people giving themselves commands
if(args[1].equals("commands")) if(args[2].equals("commands")){
return EXIT_SUCCESS; return EXIT_FAIL;
}
return EXIT_CONTINUE; return EXIT_CONTINUE;
} }

8
vMinecraftListener.java
View File

@ -90,6 +90,14 @@ public class vMinecraftListener extends PluginListener {
public void onLogin(Player player){ public void onLogin(Player player){
vMinecraftUsers.addUser(player); vMinecraftUsers.addUser(player);
} }
public boolean onIgnite(Block block, Player player) {
if(vMinecraftSettings.stopFire){
if (vMinecraftSettings.fireNoSpread.contains(block)){
return true;
}
}
return false;
}
public boolean onDamage(PluginLoader.DamageType type, BaseEntity attacker, BaseEntity defender, int amount) { public boolean onDamage(PluginLoader.DamageType type, BaseEntity attacker, BaseEntity defender, int amount) {
if(defender.isPlayer()){ if(defender.isPlayer()){
Player player = (Player)defender; Player player = (Player)defender;

6
vMinecraftSettings.java
View File

@ -40,6 +40,8 @@ public class vMinecraftSettings {
static ArrayList<String> ezModo = new ArrayList<String>(); static ArrayList<String> ezModo = new ArrayList<String>();
//An array of players currently toggled for admin chat //An array of players currently toggled for admin chat
static ArrayList<String> adminChatList = new ArrayList<String>(); static ArrayList<String> adminChatList = new ArrayList<String>();
//An array of blocks that won't catch on fire
static ArrayList<String> fireNoSpread = new ArrayList<String>();
private PropertiesFile properties; private PropertiesFile properties;
@ -88,6 +90,8 @@ public class vMinecraftSettings {
writer.write("#The health ezmodo people will have while in ezmodo. Don't set to 0\r\n"); writer.write("#The health ezmodo people will have while in ezmodo. Don't set to 0\r\n");
writer.write("ezHealth=30\r\n"); writer.write("ezHealth=30\r\n");
writer.write("stopFire=false\r\n"); writer.write("stopFire=false\r\n");
writer.write("#Flame Immune blocks will never have fire spread to them, seperate with comma. Needs stopFire to be true\r\n");
writer.write("fireNoSpread=5,17,18");
writer.write("stopTnt=false\r\n"); writer.write("stopTnt=false\r\n");
writer.write("rules=Rules@#1: No griefing@#2: No griefing\r\n"); writer.write("rules=Rules@#1: No griefing@#2: No griefing\r\n");
writer.write("#Death messages, seperate them by comma. All death messages start with the player name and a space.\r\n"); writer.write("#Death messages, seperate them by comma. All death messages start with the player name and a space.\r\n");
@ -137,7 +141,7 @@ public class vMinecraftSettings {
stopTnt = properties.getBoolean("stopTNT",true); stopTnt = properties.getBoolean("stopTNT",true);
rules = properties.getString("rules", "").split("@"); rules = properties.getString("rules", "").split("@");
deathMessages = properties.getString("deathmessages", "").split(","); deathMessages = properties.getString("deathmessages", "").split(",");
fireNoSpread.add(properties.getString("fireNoSpread", "").split(",").toString());
String[] tempEz = properties.getString("ezModo").split(","); String[] tempEz = properties.getString("ezModo").split(",");
ezModo = new ArrayList<String>(); ezModo = new ArrayList<String>();
for(String ezName : tempEz) for(String ezName : tempEz)