diff --git a/civcraft/bin/com/avrgaming/civcraft/config/CivSettings.class b/civcraft/bin/com/avrgaming/civcraft/config/CivSettings.class index fc888240d..229b17256 100644 Binary files a/civcraft/bin/com/avrgaming/civcraft/config/CivSettings.class and b/civcraft/bin/com/avrgaming/civcraft/config/CivSettings.class differ diff --git a/civcraft/bin/com/avrgaming/civcraft/endgame/ConfigEndCondition.class b/civcraft/bin/com/avrgaming/civcraft/endgame/ConfigEndCondition.class index e2f2e4b6e..cc32a071a 100644 Binary files a/civcraft/bin/com/avrgaming/civcraft/endgame/ConfigEndCondition.class and b/civcraft/bin/com/avrgaming/civcraft/endgame/ConfigEndCondition.class differ diff --git a/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$1AsyncTask.class b/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$1AsyncTask.class index 036df1116..103a70dc4 100644 Binary files a/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$1AsyncTask.class and b/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$1AsyncTask.class differ diff --git a/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$1RuffianProjectile.class b/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$1RuffianProjectile.class index 16894baf5..edb88d521 100644 Binary files a/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$1RuffianProjectile.class and b/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$1RuffianProjectile.class differ diff --git a/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$1SyncFollow.class b/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$1SyncFollow.class index e359c1cd1..9311a74a5 100644 Binary files a/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$1SyncFollow.class and b/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$1SyncFollow.class differ diff --git a/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$1SyncTask.class b/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$1SyncTask.class index d15bf249e..f09250a5b 100644 Binary files a/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$1SyncTask.class and b/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$1SyncTask.class differ diff --git a/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$2SyncTask.class b/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$2SyncTask.class index 09e33ab96..6c794b9a9 100644 Binary files a/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$2SyncTask.class and b/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$2SyncTask.class differ diff --git a/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$PVPDenyReason.class b/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$PVPDenyReason.class index 260f0a006..c4e3ad34c 100644 Binary files a/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$PVPDenyReason.class and b/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$PVPDenyReason.class differ diff --git a/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener.class b/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener.class index 76afd8f68..6aadd93b1 100644 Binary files a/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener.class and b/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener.class differ diff --git a/civcraft/bin/com/avrgaming/civcraft/main/CivGlobal.class b/civcraft/bin/com/avrgaming/civcraft/main/CivGlobal.class index 9f01f293b..785843fc5 100644 Binary files a/civcraft/bin/com/avrgaming/civcraft/main/CivGlobal.class and b/civcraft/bin/com/avrgaming/civcraft/main/CivGlobal.class differ diff --git a/civcraft/bin/com/avrgaming/civcraft/object/Civilization.class b/civcraft/bin/com/avrgaming/civcraft/object/Civilization.class index 46ce35863..0734cc830 100644 Binary files a/civcraft/bin/com/avrgaming/civcraft/object/Civilization.class and b/civcraft/bin/com/avrgaming/civcraft/object/Civilization.class differ diff --git a/civcraft/bin/com/avrgaming/civcraft/object/EconObject.class b/civcraft/bin/com/avrgaming/civcraft/object/EconObject.class index c569265ec..259b2cd1e 100644 Binary files a/civcraft/bin/com/avrgaming/civcraft/object/EconObject.class and b/civcraft/bin/com/avrgaming/civcraft/object/EconObject.class differ diff --git a/civcraft/bin/com/avrgaming/civcraft/object/Resident.class b/civcraft/bin/com/avrgaming/civcraft/object/Resident.class index 302bbe585..e9d683d78 100644 Binary files a/civcraft/bin/com/avrgaming/civcraft/object/Resident.class and b/civcraft/bin/com/avrgaming/civcraft/object/Resident.class differ diff --git a/civcraft/bin/com/avrgaming/civcraft/object/Town.class b/civcraft/bin/com/avrgaming/civcraft/object/Town.class index 2fcbbbf66..5ec0d6af4 100644 Binary files a/civcraft/bin/com/avrgaming/civcraft/object/Town.class and b/civcraft/bin/com/avrgaming/civcraft/object/Town.class differ diff --git a/civcraft/bin/com/avrgaming/civcraft/structure/Library.class b/civcraft/bin/com/avrgaming/civcraft/structure/Library.class index 25dd46270..cdb59a1d6 100644 Binary files a/civcraft/bin/com/avrgaming/civcraft/structure/Library.class and b/civcraft/bin/com/avrgaming/civcraft/structure/Library.class differ diff --git a/civcraft/bin/com/avrgaming/civcraft/structure/Stable$1buyHorseAction.class b/civcraft/bin/com/avrgaming/civcraft/structure/Stable$1buyHorseAction.class index 5370b32d2..bdb9339bd 100644 Binary files a/civcraft/bin/com/avrgaming/civcraft/structure/Stable$1buyHorseAction.class and b/civcraft/bin/com/avrgaming/civcraft/structure/Stable$1buyHorseAction.class differ diff --git a/civcraft/bin/com/avrgaming/civcraft/structure/Stable$1buyItemAction.class b/civcraft/bin/com/avrgaming/civcraft/structure/Stable$1buyItemAction.class index 0b824baf7..44d0d0d68 100644 Binary files a/civcraft/bin/com/avrgaming/civcraft/structure/Stable$1buyItemAction.class and b/civcraft/bin/com/avrgaming/civcraft/structure/Stable$1buyItemAction.class differ diff --git a/civcraft/bin/com/avrgaming/civcraft/structure/Stable.class b/civcraft/bin/com/avrgaming/civcraft/structure/Stable.class index 94704625c..3c8e5ed8a 100644 Binary files a/civcraft/bin/com/avrgaming/civcraft/structure/Stable.class and b/civcraft/bin/com/avrgaming/civcraft/structure/Stable.class differ diff --git a/civcraft/bin/gpl/HorseModifier$HorseType.class b/civcraft/bin/gpl/HorseModifier$HorseType.class index c2c101223..1d1e6d17d 100644 Binary files a/civcraft/bin/gpl/HorseModifier$HorseType.class and b/civcraft/bin/gpl/HorseModifier$HorseType.class differ diff --git a/civcraft/bin/gpl/HorseModifier$HorseVariant.class b/civcraft/bin/gpl/HorseModifier$HorseVariant.class index 1d066ee73..d0843c592 100644 Binary files a/civcraft/bin/gpl/HorseModifier$HorseVariant.class and b/civcraft/bin/gpl/HorseModifier$HorseVariant.class differ diff --git a/civcraft/bin/gpl/HorseModifier$NBTUtil.class b/civcraft/bin/gpl/HorseModifier$NBTUtil.class index 5382b7085..59a76b1b4 100644 Binary files a/civcraft/bin/gpl/HorseModifier$NBTUtil.class and b/civcraft/bin/gpl/HorseModifier$NBTUtil.class differ diff --git a/civcraft/bin/gpl/HorseModifier$ReflectionUtil.class b/civcraft/bin/gpl/HorseModifier$ReflectionUtil.class index 424b045ae..2c63e6227 100644 Binary files a/civcraft/bin/gpl/HorseModifier$ReflectionUtil.class and b/civcraft/bin/gpl/HorseModifier$ReflectionUtil.class differ diff --git a/civcraft/bin/gpl/HorseModifier.class b/civcraft/bin/gpl/HorseModifier.class index 3b1b5daf5..daea3c928 100644 Binary files a/civcraft/bin/gpl/HorseModifier.class and b/civcraft/bin/gpl/HorseModifier.class differ diff --git a/civcraft/src/com/avrgaming/civcraft/listener/BlockListener.java b/civcraft/src/com/avrgaming/civcraft/listener/BlockListener.java index bec1b5bd4..3f1a8d83e 100644 --- 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 index d5f085990..87d41698d 100644 --- 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 index 2b52a5e04..1763069d0 100644 --- 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 chunks = new HashSet(); + public HashTreeSet chunks = new HashTreeSet(); public static Map stableChunks = new ConcurrentHashMap(); public Stable(ResultSet rs) throws SQLException, CivException { diff --git a/civcraft/src/gpl/HorseModifier.java b/civcraft/src/gpl/HorseModifier.java index 7b4717f64..bd714ed78 100644 --- 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