Cleanup some errors from PR's

ataranlen · Jul 22, 2017 · 193cf6e · 193cf6e
1 parent 9ad53ec
commit 193cf6e
Show file tree

Hide file tree

Showing 27 changed files with 11 additions and 2 deletions.
diff --git a/civcraft/bin/com/avrgaming/civcraft/config/CivSettings.class b/civcraft/bin/com/avrgaming/civcraft/config/CivSettings.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/endgame/ConfigEndCondition.class b/civcraft/bin/com/avrgaming/civcraft/endgame/ConfigEndCondition.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$1AsyncTask.class b/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$1AsyncTask.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$1RuffianProjectile.class b/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$1RuffianProjectile.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$1SyncFollow.class b/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$1SyncFollow.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$1SyncTask.class b/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$1SyncTask.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$2SyncTask.class b/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$2SyncTask.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$PVPDenyReason.class b/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$PVPDenyReason.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener.class b/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/main/CivGlobal.class b/civcraft/bin/com/avrgaming/civcraft/main/CivGlobal.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/object/Civilization.class b/civcraft/bin/com/avrgaming/civcraft/object/Civilization.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/object/EconObject.class b/civcraft/bin/com/avrgaming/civcraft/object/EconObject.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/object/Resident.class b/civcraft/bin/com/avrgaming/civcraft/object/Resident.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/object/Town.class b/civcraft/bin/com/avrgaming/civcraft/object/Town.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/structure/Library.class b/civcraft/bin/com/avrgaming/civcraft/structure/Library.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/structure/Stable$1buyHorseAction.class b/civcraft/bin/com/avrgaming/civcraft/structure/Stable$1buyHorseAction.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/structure/Stable$1buyItemAction.class b/civcraft/bin/com/avrgaming/civcraft/structure/Stable$1buyItemAction.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/structure/Stable.class b/civcraft/bin/com/avrgaming/civcraft/structure/Stable.class
diff --git a/civcraft/bin/gpl/HorseModifier$HorseType.class b/civcraft/bin/gpl/HorseModifier$HorseType.class
diff --git a/civcraft/bin/gpl/HorseModifier$HorseVariant.class b/civcraft/bin/gpl/HorseModifier$HorseVariant.class
diff --git a/civcraft/bin/gpl/HorseModifier$NBTUtil.class b/civcraft/bin/gpl/HorseModifier$NBTUtil.class
diff --git a/civcraft/bin/gpl/HorseModifier$ReflectionUtil.class b/civcraft/bin/gpl/HorseModifier$ReflectionUtil.class
diff --git a/civcraft/bin/gpl/HorseModifier.class b/civcraft/bin/gpl/HorseModifier.class
diff --git a/civcraft/src/com/avrgaming/civcraft/listener/BlockListener.java b/civcraft/src/com/avrgaming/civcraft/listener/BlockListener.java
@@ -128,6 +128,7 @@
 import com.avrgaming.civcraft.structure.CannonTower;
 import com.avrgaming.civcraft.structure.Farm;
 import com.avrgaming.civcraft.structure.Pasture;
+import com.avrgaming.civcraft.structure.Stable;
 //import com.avrgaming.civcraft.structure.Temple;
 import com.avrgaming.civcraft.structure.Wall;
 import com.avrgaming.civcraft.structure.farm.FarmChunk;

diff --git a/civcraft/src/com/avrgaming/civcraft/object/VaultEconObject.java b/civcraft/src/com/avrgaming/civcraft/object/VaultEconObject.java
@@ -3,7 +3,6 @@
 import com.avrgaming.civcraft.main.CivGlobal;
 import net.milkbowl.vault.economy.Economy;
 import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
 import java.util.UUID;

diff --git a/civcraft/src/com/avrgaming/civcraft/structure/Stable.java b/civcraft/src/com/avrgaming/civcraft/structure/Stable.java
@@ -25,10 +25,13 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.attribute.Attribute;
+import org.bukkit.craftbukkit.v1_11_R1.util.HashTreeSet;
 import org.bukkit.entity.Horse;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerInteractEvent;
@@ -49,6 +52,7 @@
 import com.avrgaming.civcraft.object.StructureSign;
 import com.avrgaming.civcraft.object.Town;
 import com.avrgaming.civcraft.util.BlockCoord;
+import com.avrgaming.civcraft.util.ChunkCoord;
 import com.avrgaming.civcraft.util.CivColor;
 import com.avrgaming.civcraft.util.ItemManager;
 import com.avrgaming.civcraft.util.SimpleBlock;
@@ -62,7 +66,7 @@ public class Stable extends Structure {
 	private BlockCoord muleSpawnCoord;
 	private NonMemberFeeComponent nonMemberFeeComponent;
 
-	public HashSet<ChunkCoord> chunks = new HashSet<ChunkCoord>();
+	public HashTreeSet<ChunkCoord> chunks = new HashTreeSet<ChunkCoord>();
 	public static Map<ChunkCoord, Stable> stableChunks = new ConcurrentHashMap<ChunkCoord, Stable>();
 
 	public Stable(ResultSet rs) throws SQLException, CivException {

diff --git a/civcraft/src/gpl/HorseModifier.java b/civcraft/src/gpl/HorseModifier.java
@@ -19,6 +19,11 @@
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.metadata.FixedMetadataValue;
+
+import com.avrgaming.civcraft.main.CivCraft;
+import com.avrgaming.civcraft.main.CivLog;
+import com.avrgaming.civcraft.main.CivMessage;
 
 /**
 * HorseModifier v1.1