EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/oloflarsson/Factions

Browse Source
This commit is contained in:
Brettflan
2011-04-04 06:37:15 -05:00
parent b912b49289 c3c69a30dd
commit 2ec8437c35
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/bukkit/mcteam/factions/Board.java
View File

@@ -15,6 +15,7 @@ import org.bukkit.ChatColor;
import com.bukkit.mcteam.factions.util.TextUtil; import com.bukkit.mcteam.factions.util.TextUtil;
import com.bukkit.mcteam.gson.reflect.TypeToken; import com.bukkit.mcteam.gson.reflect.TypeToken;
import com.bukkit.mcteam.gson.JsonArray; import com.bukkit.mcteam.gson.JsonArray;
import com.bukkit.mcteam.gson.JsonElement;
import com.bukkit.mcteam.gson.JsonObject; import com.bukkit.mcteam.gson.JsonObject;
import com.bukkit.mcteam.gson.JsonParser; import com.bukkit.mcteam.gson.JsonParser;
import com.bukkit.mcteam.util.AsciiCompass; import com.bukkit.mcteam.util.AsciiCompass;
@@ -252,7 +253,7 @@ public class Board {
JsonParser parser = new JsonParser(); JsonParser parser = new JsonParser();
JsonObject json = (JsonObject) parser.parse(DiscUtil.read(jsonFile)); JsonObject json = (JsonObject) parser.parse(DiscUtil.read(jsonFile));
JsonArray coords = json.getAsJsonArray("coordFactionIds"); JsonArray coords = json.getAsJsonArray("coordFactionIds");
Iterator coordSet = coords.iterator(); Iterator<JsonElement> coordSet = coords.iterator();
while(coordSet.hasNext()) { while(coordSet.hasNext()) {
JsonArray coordDat = (JsonArray) coordSet.next(); JsonArray coordDat = (JsonArray) coordSet.next();
JsonObject coord = coordDat.get(0).getAsJsonObject(); JsonObject coord = coordDat.get(0).getAsJsonObject();

2
src/com/bukkit/mcteam/factions/commands/FCommandHome.java
View File

@@ -30,7 +30,7 @@ public class FCommandHome extends FBaseCommand {
return; return;
} }
player.teleportTo(myFaction.getHome()); player.teleport(myFaction.getHome());
} }
} }

3
src/com/bukkit/mcteam/factions/listeners/FactionsBlockListener.java
View File

@@ -1,6 +1,5 @@
package com.bukkit.mcteam.factions.listeners; package com.bukkit.mcteam.factions.listeners;
import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockBreakEvent;
@@ -9,12 +8,10 @@ import org.bukkit.event.block.BlockListener;
import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.block.BlockPlaceEvent;
import com.bukkit.mcteam.factions.Board; import com.bukkit.mcteam.factions.Board;
import com.bukkit.mcteam.factions.Conf;
import com.bukkit.mcteam.factions.FLocation; import com.bukkit.mcteam.factions.FLocation;
import com.bukkit.mcteam.factions.FPlayer; import com.bukkit.mcteam.factions.FPlayer;
import com.bukkit.mcteam.factions.Faction; import com.bukkit.mcteam.factions.Faction;
import com.bukkit.mcteam.factions.Factions; import com.bukkit.mcteam.factions.Factions;
import com.bukkit.mcteam.factions.util.TextUtil;
public class FactionsBlockListener extends BlockListener { public class FactionsBlockListener extends BlockListener {