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

More changes, xmas, hook error stoppan, and other stuff

Browse Source
This commit is contained in:
nossr50 2010-12-31 09:10:30 -08:00
parent 92c8ffa0a2
commit 9f840a3079
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vMinecraftChat.java
View File

@ -565,6 +565,7 @@ public class vMinecraftChat {
int counter = 0; int counter = 0;
int i = 0; int i = 0;
boolean taste = false; boolean taste = false;
boolean xmasparty = false;
for(String msg: message) for(String msg: message)
{ {
@ -621,7 +622,7 @@ public class vMinecraftChat {
x--; x--;
} }
} }
if(taste || recentColor.equals("^x")) if(xmasparty || recentColor.equals("^x"))
{ {
//Skip the quake code for xmas //Skip the quake code for xmas
if(recentColor.equals("^x")) if(recentColor.equals("^x"))
@ -631,7 +632,7 @@ public class vMinecraftChat {
//Taste keeps it going with xmas if there //Taste keeps it going with xmas if there
//are more lines //are more lines
taste = true; xmasparty = true;
//Loop through the message applying the colors //Loop through the message applying the colors
while(x < msg.length() && msg.charAt(x) != '^' while(x < msg.length() && msg.charAt(x) != '^'
&& msg.charAt(x) != Colors.Red.charAt(0)) && msg.charAt(x) != Colors.Red.charAt(0))
@ -648,7 +649,7 @@ public class vMinecraftChat {
|| x < msg.length() || x < msg.length()
&& msg.charAt(x) == Colors.Red.charAt(0) ) && msg.charAt(x) == Colors.Red.charAt(0) )
{ {
taste = false; xmasparty = false;
i = 0; i = 0;
x--; x--;
} }

1
vMinecraftListener.java
View File

@ -96,6 +96,7 @@ public class vMinecraftListener extends PluginListener {
{ {
Warp home = null; Warp home = null;
home = etc.getDataSource().getHome(player.getName()); home = etc.getDataSource().getHome(player.getName());
if(home.Location != null)
player.teleportTo(home.Location); player.teleportTo(home.Location);
//Makes sure the player has a custom home before telling them about /myspawn //Makes sure the player has a custom home before telling them about /myspawn
if(etc.getServer().getSpawnLocation() != etc.getDataSource().getHome(player.getName()).Location){ if(etc.getServer().getSpawnLocation() != etc.getDataSource().getHome(player.getName()).Location){

5
vMinecraftSettings.java
View File

@ -195,9 +195,10 @@ public class vMinecraftSettings {
String[] tempEz = properties.getString("ezModo").split(","); String[] tempEz = properties.getString("ezModo").split(",");
String[] fireblocks = properties.getString("fireblocks").split(","); String[] fireblocks = properties.getString("fireblocks").split(",");
fireblockan = new ArrayList<Integer>(); fireblockan = new ArrayList<Integer>();
for(int x = 0;x < fireblocks.length; x++) for(String str : fireblocks)
{ {
fireblockan.add(Integer.parseInt(fireblocks[x])); if(!str.isEmpty())
fireblockan.add(Integer.parseInt(str));
} }
ezModo = new ArrayList<String>(); ezModo = new ArrayList<String>();
ezModo.addAll(Arrays.asList(tempEz)); ezModo.addAll(Arrays.asList(tempEz));