mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2024-11-21 12:46:46 +01:00
Removed web stuff (caused crash)
This commit is contained in:
parent
12ec602f7f
commit
879dccff80
@ -77,9 +77,11 @@
|
||||
<file leaf-file-name="PlotMain.java" pinned="false" current="true" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.389738" vertical-offset="0" max-vertical-offset="11747">
|
||||
<caret line="28" column="32" selection-start-line="28" selection-start-column="32" selection-end-line="28" selection-end-column="32" />
|
||||
<folding />
|
||||
<state vertical-scroll-proportion="2.3176856" vertical-offset="9148" max-vertical-offset="11611">
|
||||
<caret line="694" column="10" selection-start-line="694" selection-start-column="10" selection-end-line="694" selection-end-column="10" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -417,7 +419,7 @@
|
||||
<updated>1411382235722</updated>
|
||||
<workItem from="1411382238709" duration="182000" />
|
||||
<workItem from="1411382421959" duration="656000" />
|
||||
<workItem from="1411383098267" duration="2417000" />
|
||||
<workItem from="1411383098267" duration="2536000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="First Commit">
|
||||
<created>1411382351159</created>
|
||||
@ -439,11 +441,15 @@
|
||||
<created>1411385985343</created>
|
||||
<updated>1411385985343</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="6" />
|
||||
<task id="LOCAL-00006" summary="Removed web stuff (caused crash)">
|
||||
<created>1411386181908</created>
|
||||
<updated>1411386181908</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="7" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="3255000" />
|
||||
<option name="totallyTimeSpent" value="3374000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="-6" y="-6" width="1932" height="1062" extended-state="6" />
|
||||
@ -495,7 +501,8 @@
|
||||
<MESSAGE value="Use this xD" />
|
||||
<MESSAGE value="Included source..." />
|
||||
<MESSAGE value="Yey!" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Yey!" />
|
||||
<MESSAGE value="Removed web stuff (caused crash)" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Removed web stuff (caused crash)" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager />
|
||||
@ -597,9 +604,11 @@
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.389738" vertical-offset="0" max-vertical-offset="11747">
|
||||
<caret line="28" column="32" selection-start-line="28" selection-start-column="32" selection-end-line="28" selection-end-column="32" />
|
||||
<folding />
|
||||
<state vertical-scroll-proportion="2.3176856" vertical-offset="9148" max-vertical-offset="11611">
|
||||
<caret line="694" column="10" selection-start-line="694" selection-start-column="10" selection-end-line="694" selection-end-column="10" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
@ -10,20 +10,18 @@
|
||||
package com.intellectualcrafters.plot;
|
||||
|
||||
import ca.mera.CameraAPI;
|
||||
|
||||
import com.intellectualcrafters.plot.commands.Camera;
|
||||
import com.intellectualcrafters.plot.database.*;
|
||||
import com.intellectualcrafters.plot.Logger.LogLevel;
|
||||
import com.intellectualcrafters.plot.Settings.Web;
|
||||
import com.intellectualcrafters.plot.commands.Camera;
|
||||
import com.intellectualcrafters.plot.commands.MainCommand;
|
||||
import com.intellectualcrafters.plot.database.DBFunc;
|
||||
import com.intellectualcrafters.plot.database.MySQL;
|
||||
import com.intellectualcrafters.plot.database.PlotMeConverter;
|
||||
import com.intellectualcrafters.plot.events.PlayerTeleportToPlotEvent;
|
||||
import com.intellectualcrafters.plot.listeners.PlayerEvents;
|
||||
import com.intellectualcrafters.plot.listeners.WorldEditListener;
|
||||
import com.intellectualsites.web.PlotWeb;
|
||||
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
|
||||
|
||||
import me.confuser.barapi.BarAPI;
|
||||
|
||||
import org.bukkit.*;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
import org.bukkit.entity.Entity;
|
||||
@ -39,15 +37,8 @@ import java.sql.Connection;
|
||||
import java.sql.DatabaseMetaData;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.*;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.UUID;
|
||||
|
||||
import static org.bukkit.Material.*;
|
||||
|
||||
@ -701,13 +692,14 @@ public class PlotMain extends JavaPlugin {
|
||||
Logger.add(LogLevel.DANGER, "Could not close mysql connection");
|
||||
}
|
||||
}
|
||||
/*
|
||||
if(PlotWeb.PLOTWEB != null) {
|
||||
try {
|
||||
PlotWeb.PLOTWEB.stop();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}*/
|
||||
}
|
||||
public static void addPlotWorld(String world,PlotWorld plotworld) {
|
||||
PlotMain.worlds.put(world,plotworld);
|
||||
|
Loading…
Reference in New Issue
Block a user