From 38ec36f81d9a0ae382fffc95adbe5016a1763188 Mon Sep 17 00:00:00 2001 From: boy0001 Date: Sat, 27 Sep 2014 14:15:59 +1000 Subject: [PATCH] Fixed texture packs --- .../intellectualcrafters/plot/WorldGenerator.java | 3 +-- .../plot/listeners/PlayerEvents.java | 12 ++++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/PlotSquared/src/com/intellectualcrafters/plot/WorldGenerator.java b/PlotSquared/src/com/intellectualcrafters/plot/WorldGenerator.java index 4c713cc92..d845f5336 100644 --- a/PlotSquared/src/com/intellectualcrafters/plot/WorldGenerator.java +++ b/PlotSquared/src/com/intellectualcrafters/plot/WorldGenerator.java @@ -15,8 +15,7 @@ import java.util.Map.Entry; import static com.intellectualcrafters.plot.PlotWorld.*; /** - * TODO finish recoding this class - * + * * @auther Empire92 * @author Citymonstret * diff --git a/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java b/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java index 268270699..c3b5966d1 100644 --- a/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java +++ b/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java @@ -131,18 +131,14 @@ public class PlayerEvents implements Listener { } private void textures(Player p) { - - // TODO this thing still bugs you about non existing texture packs - // What can I do about it? - fix it. - -// if ((Settings.PLOT_SPECIFIC_RESOURCE_PACK.length() > 1) && isPlotWorld(p.getWorld())) { -// p.setResourcePack(Settings.PLOT_SPECIFIC_RESOURCE_PACK); -// } + if ((Settings.PLOT_SPECIFIC_RESOURCE_PACK.length() > 1) && isPlotWorld(p.getWorld())) { + p.setResourcePack(Settings.PLOT_SPECIFIC_RESOURCE_PACK); + } } @EventHandler public void onChangeWorld(PlayerChangedWorldEvent event) { - if (isPlotWorld(event.getFrom())) { + if (isPlotWorld(event.getFrom()) && Settings.PLOT_SPECIFIC_RESOURCE_PACK.length() > 1) { event.getPlayer().setResourcePack(""); } else { textures(event.getPlayer());