mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2024-11-25 12:25:46 +01:00
Try this coolty
This commit is contained in:
parent
e3f5842299
commit
1bf05df706
@ -394,7 +394,9 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
|
||||
if (econ.init()) {
|
||||
return econ;
|
||||
}
|
||||
System.out.println("ECONOMY ENABLED!");
|
||||
} catch (Throwable ignored) {
|
||||
ignored.printStackTrace();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
@ -21,7 +21,6 @@ import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.Set;
|
||||
import org.bukkit.Chunk;
|
||||
@ -139,8 +138,8 @@ public class FastQueue_1_8_3 extends SlowQueue {
|
||||
|
||||
Object[] sections = (Object[]) sections1.get(c);
|
||||
HashMap<?, ?> tiles = (HashMap<?, ?>) tileEntities.get(c);
|
||||
List<Object> tilesUnload = (List<Object>) tileEntityUnload.of(w).get();
|
||||
List<?>[] entities = (List<?>[]) entitySlices.get(c);
|
||||
Collection<Object> tilesUnload = (Collection<Object>) tileEntityUnload.of(w).get();
|
||||
Collection<?>[] entities = (Collection<?>[]) entitySlices.get(c);
|
||||
|
||||
Method getX = null;
|
||||
Method getY = null;
|
||||
|
@ -22,7 +22,6 @@ import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.Set;
|
||||
import org.bukkit.Chunk;
|
||||
@ -153,7 +152,7 @@ public class FastQueue_1_9 extends SlowQueue {
|
||||
|
||||
Object[] sections = (Object[]) sf.get(c);
|
||||
HashMap<?, ?> tiles = (HashMap<?, ?>) tf.get(c);
|
||||
List<Object> tilesUnload = (List<Object>) tileEntityUnload.of(w).get();
|
||||
Collection<Object> tilesUnload = (Collection<Object>) tileEntityUnload.of(w).get();
|
||||
Collection<?>[] entities = (Collection<?>[]) entitySlices.get(c);
|
||||
|
||||
Method xm = null;
|
||||
|
@ -264,6 +264,7 @@ public class PS {
|
||||
TaskManager.runTask(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
System.out.println("SETTING UP ECON");
|
||||
EconHandler.manager = PS.this.IMP.getEconomyHandler();
|
||||
}
|
||||
});
|
||||
|
@ -240,7 +240,7 @@ public abstract class PlotArea {
|
||||
this.SCHEMATIC_FILE = config.getString("schematic.file");
|
||||
this.SCHEMATIC_CLAIM_SPECIFY = config.getBoolean("schematic.specify_on_claim");
|
||||
this.SCHEMATICS = config.getStringList("schematic.schematics");
|
||||
this.USE_ECONOMY = config.getBoolean("economy.use") && EconHandler.manager != null;
|
||||
this.USE_ECONOMY = config.getBoolean("economy.use") && EconHandler.getEconHandler() != null;
|
||||
ConfigurationSection priceSection = config.getConfigurationSection("economy.prices");
|
||||
if (this.USE_ECONOMY) {
|
||||
this.PRICES = new HashMap<>();
|
||||
|
@ -1,5 +1,6 @@
|
||||
package com.intellectualcrafters.plot.util;
|
||||
|
||||
import com.intellectualcrafters.plot.PS;
|
||||
import com.intellectualcrafters.plot.object.ConsolePlayer;
|
||||
import com.intellectualcrafters.plot.object.OfflinePlotPlayer;
|
||||
import com.intellectualcrafters.plot.object.PlotPlayer;
|
||||
@ -7,6 +8,15 @@ import com.intellectualcrafters.plot.object.PlotPlayer;
|
||||
public abstract class EconHandler {
|
||||
|
||||
public static EconHandler manager;
|
||||
private static boolean initialized;
|
||||
|
||||
public static EconHandler getEconHandler() {
|
||||
if (initialized) {
|
||||
return manager;
|
||||
}
|
||||
initialized = true;
|
||||
return manager = PS.get().IMP.getEconomyHandler();
|
||||
}
|
||||
|
||||
public double getMoney(PlotPlayer player) {
|
||||
if (ConsolePlayer.isConsole(player)) {
|
||||
|
Loading…
Reference in New Issue
Block a user