EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 05:06:44 +01:00
Code Issues Projects Releases Wiki Activity

Fixed some items on the to-do list.

Browse Source
This commit is contained in:
Sauilitired 2014-10-02 17:00:34 +02:00
parent aa81704f80
commit ff05ef840b
9 changed files with 371 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

485
.idea/workspace.xml
View File

@ -5,7 +5,7 @@
</component> </component>
<component name="ArtifactsWorkspaceSettings"> <component name="ArtifactsWorkspaceSettings">
<artifacts-to-build> <artifacts-to-build>
<artifact name="plotsquared__" /> <artifact name="PlotSquared" />
</artifacts-to-build> </artifacts-to-build>
</component> </component>
<component name="BookmarkManager"> <component name="BookmarkManager">
@ -14,7 +14,13 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="f6aaf715-4424-4f9e-96dc-b47edea10520" name="Default" comment=""> <list default="true" id="f6aaf715-4424-4f9e-96dc-b47edea10520" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Auto.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Auto.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Auto.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Auto.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Set.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Set.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Debug.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Debug.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Info.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Info.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/PlotMeConverter.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/PlotMeConverter.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Settings.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Settings.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list> </list>
<ignored path="plot_news.iws" /> <ignored path="plot_news.iws" />
@ -38,28 +44,42 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file leaf-file-name="Title.java" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="Auto.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Title.java"> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Auto.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="306" max-vertical-offset="7021"> <state vertical-scroll-proportion="0.0" vertical-offset="1156" max-vertical-offset="2074">
<caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" /> <caret line="94" column="23" selection-start-line="94" selection-start-column="23" selection-end-line="94" selection-end-column="23" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Auto.java" pinned="false" current="true" current-in-tab="true"> <file leaf-file-name="Set.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Auto.java"> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Set.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="3.7777777" vertical-offset="0" max-vertical-offset="2346"> <state vertical-scroll-proportion="1.6353468" vertical-offset="0" max-vertical-offset="6511">
<caret line="132" column="1" selection-start-line="132" selection-start-column="1" selection-end-line="132" selection-end-column="1" /> <caret line="67" column="9" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
<folding> <folding />
<element signature="e#0#5049#0" expanded="true" /> </state>
<element signature="imports" expanded="true" /> </provider>
<element signature="e#719#751#0" expanded="true" /> </entry>
<element signature="e#809#810#0" expanded="true" /> </file>
<element signature="e#917#918#0" expanded="true" /> <file leaf-file-name="Command.java" pinned="false" current="false" current-in-tab="false">
</folding> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Command.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="2771">
<caret line="18" column="7" selection-start-line="18" selection-start-column="7" selection-end-line="18" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Debug.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Debug.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="82" max-vertical-offset="1870">
<caret line="46" column="0" selection-start-line="46" selection-start-column="0" selection-end-line="46" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -67,49 +87,36 @@
<file leaf-file-name="Settings.java" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="Settings.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Settings.java"> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Settings.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="306" max-vertical-offset="1700"> <state vertical-scroll-proportion="0.0" vertical-offset="1121" max-vertical-offset="1581">
<caret line="18" column="23" selection-start-line="18" selection-start-column="23" selection-end-line="18" selection-end-column="23" /> <caret line="83" column="52" selection-start-line="83" selection-start-column="52" selection-end-line="83" selection-end-column="52" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="SetBlockFast.java" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="PlotMain.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/SetBlockFast.java"> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="102" max-vertical-offset="935"> <state vertical-scroll-proportion="0.0" vertical-offset="7773" max-vertical-offset="17306">
<caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" /> <caret line="485" column="0" selection-start-line="485" selection-start-column="0" selection-end-line="485" selection-end-column="0" />
<folding /> <folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="PlotAPI.java" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="PlotMeConverter.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/api/PlotAPI.java"> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/PlotMeConverter.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1853" max-vertical-offset="4488"> <state vertical-scroll-proportion="0.0" vertical-offset="2460" max-vertical-offset="2941">
<caret line="156" column="19" selection-start-line="156" selection-start-column="19" selection-end-line="156" selection-end-column="19" /> <caret line="176" column="103" selection-start-line="176" selection-start-column="103" selection-end-line="176" selection-end-column="103" />
<folding /> <folding>
</state> <element signature="e#1097#10140#0" expanded="true" />
</provider> <element signature="e#1258#1294#0" expanded="true" />
</entry> <element signature="e#1357#1371#0" expanded="true" />
</file> <element signature="e#10129#10130#0" expanded="true" />
<file leaf-file-name="SchematicHandler.java" pinned="false" current="false" current-in-tab="false"> </folding>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/SchematicHandler.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2125" max-vertical-offset="3077">
<caret line="125" column="32" selection-start-line="125" selection-start-column="32" selection-end-line="125" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="RUtils.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/RUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="323" max-vertical-offset="1615">
<caret line="19" column="3" selection-start-line="19" selection-start-column="3" selection-end-line="19" selection-end-column="3" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -117,28 +124,68 @@
<file leaf-file-name="DBFunc.java" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="DBFunc.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java"> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="6154" max-vertical-offset="11152"> <state vertical-scroll-proportion="0.0" vertical-offset="38" max-vertical-offset="13277">
<caret line="362" column="86" selection-start-line="362" selection-start-column="86" selection-end-line="362" selection-end-column="86" /> <caret line="41" column="28" selection-start-line="41" selection-start-column="28" selection-end-line="41" selection-end-column="28" />
<folding>
<marker date="1412261855581" expanded="true" signature="1593:1664" placeholder="UPDATE `plot..." />
<marker date="1412261855581" expanded="true" signature="2509:2567" placeholder="SELECT `id`,..plot..." />
<marker date="1412261855581" expanded="true" signature="6725:6806" placeholder="INSERT INTO ..." />
<marker date="1412261855581" expanded="true" signature="7532:7888" placeholder="CREATE TABLE..plot..." />
<marker date="1412261855581" expanded="true" signature="7919:8076" placeholder="CREATE TABLE..plot_denied..." />
<marker date="1412261855581" expanded="true" signature="8107:8265" placeholder="CREATE TABLE..plot_helpers..." />
<marker date="1412261855581" expanded="true" signature="8296:8454" placeholder="CREATE TABLE..plot_trusted..." />
<marker date="1412261855581" expanded="true" signature="8485:9061" placeholder="CREATE TABLE..plot_settings..." />
<marker date="1412261855581" expanded="true" signature="9130:9252" placeholder="ALTER TABLE `plot_settings`..." />
<marker date="1412261855581" expanded="true" signature="9330:9597" placeholder="CREATE TABLE..plot..." />
<marker date="1412261855581" expanded="true" signature="9628:9750" placeholder="CREATE TABLE..plot_denied..." />
<marker date="1412261855581" expanded="true" signature="9781:9904" placeholder="CREATE TABLE..plot_helpers..." />
<marker date="1412261855581" expanded="true" signature="9935:10058" placeholder="CREATE TABLE..plot_trusted..." />
<marker date="1412261855581" expanded="true" signature="10089:10587" placeholder="CREATE TABLE..plot_settings..." />
<marker date="1412261855581" expanded="true" signature="11133:11185" placeholder="DELETE FROM ..." />
<marker date="1412261855581" expanded="true" signature="11361:11412" placeholder="DELETE FROM ..." />
<marker date="1412261855581" expanded="true" signature="11588:11639" placeholder="DELETE FROM ..." />
<marker date="1412261855581" expanded="true" signature="11815:11848" placeholder="DELETE FROM ..." />
<marker date="1412261855581" expanded="true" signature="12563:12621" placeholder="INSERT INTO ..." />
<marker date="1412261855581" expanded="true" signature="13034:13138" placeholder="SELECT `id` ..plot..." />
<marker date="1412261855581" expanded="true" signature="14837:15175" placeholder="UPDATE `plot..." />
<marker date="1412261855581" expanded="true" signature="15215:15233" placeholder="ALTER TABLE `plot`..." />
<marker date="1412261855581" expanded="true" signature="15662:15723" placeholder="ALTER TABLE `plot_settings`..." />
<marker date="1412261855581" expanded="true" signature="16171:16238" placeholder="SELECT `id`,..plot..." />
<marker date="1412261855581" expanded="true" signature="20491:20553" placeholder="UPDATE `plot..." />
<marker date="1412261855581" expanded="true" signature="21448:21512" placeholder="UPDATE `plot..." />
<marker date="1412261855581" expanded="true" signature="22521:22584" placeholder="UPDATE `plot..." />
<marker date="1412261855581" expanded="true" signature="23404:23468" placeholder="UPDATE `plot..." />
<marker date="1412261855581" expanded="true" signature="24505:24572" placeholder="UPDATE `plot..." />
<marker date="1412261855581" expanded="true" signature="25271:25325" placeholder="SELECT * FRO..plot_settings..." />
<marker date="1412261855581" expanded="true" signature="27028:27090" placeholder="SELECT `user..plot_denied..." />
<marker date="1412261855581" expanded="true" signature="27830:27892" placeholder="SELECT `user..plot_helpers..." />
<marker date="1412261855581" expanded="true" signature="28567:28629" placeholder="SELECT `user..plot_trusted..." />
<marker date="1412261855581" expanded="true" signature="29358:29429" placeholder="DELETE FROM ..." />
<marker date="1412261855581" expanded="true" signature="30244:30315" placeholder="DELETE FROM ..." />
<marker date="1412261855581" expanded="true" signature="31128:31196" placeholder="INSERT INTO ..." />
<marker date="1412261855581" expanded="true" signature="32005:32073" placeholder="INSERT INTO ..." />
<marker date="1412261855581" expanded="true" signature="32886:32956" placeholder="DELETE FROM ..." />
<marker date="1412261855581" expanded="true" signature="33763:33830" placeholder="INSERT INTO ..." />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PlotHelper.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="12516" max-vertical-offset="19533">
<caret line="771" column="0" selection-start-line="771" selection-start-column="0" selection-end-line="771" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ReflectionUtils.java" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="FlagManager.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/ReflectionUtils.java"> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/FlagManager.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="289" max-vertical-offset="9809"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1581">
<caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" /> <caret line="8" column="7" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PWE.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PWE.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="323" max-vertical-offset="1411">
<caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -172,15 +219,20 @@
<option value="$PROJECT_DIR$/PlotSquared/src/plugin.yml" /> <option value="$PROJECT_DIR$/PlotSquared/src/plugin.yml" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/XPopulator.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/XPopulator.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/SQLite.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/SQLite.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Settings.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Metrics.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Metrics.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/AbstractFlag.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/AbstractFlag.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Flag.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Flag.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/FlagManager.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/FlagManager.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/WorldGenerator.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/WorldGenerator.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/api/PlotAPI.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/api/PlotAPI.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Set.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Info.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Debug.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Settings.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/PlotMeConverter.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Auto.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Auto.java" />
</list> </list>
</option> </option>
@ -454,12 +506,28 @@
<property name="GenerateAntBuildDialog.inclineRuntiemClasspath" value="true" /> <property name="GenerateAntBuildDialog.inclineRuntiemClasspath" value="true" />
<property name="GenerateAntBuildDialog.generateIdeaHomeProperty" value="true" /> <property name="GenerateAntBuildDialog.generateIdeaHomeProperty" value="true" />
<property name="GenerateAntBuildDialog.outputFileNameProperty" value="plotsquared" /> <property name="GenerateAntBuildDialog.outputFileNameProperty" value="plotsquared" />
<property name="options.lastSelected" value="SQL Dialects" /> <property name="options.lastSelected" value="project.propVCSSupport.Mappings" />
<property name="options.splitter.main.proportions" value="0.3" /> <property name="options.splitter.main.proportions" value="0.3" />
<property name="options.splitter.details.proportions" value="0.2" /> <property name="options.splitter.details.proportions" value="0.2" />
<property name="options.searchVisible" value="true" /> <property name="options.searchVisible" value="true" />
<property name="OverrideImplement.combined" value="true" /> <property name="OverrideImplement.combined" value="true" />
<property name="OverrideImplement.overriding.sorted" value="false" /> <property name="OverrideImplement.overriding.sorted" value="false" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="140" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="169" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="170" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="844" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="162" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="161" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="163" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="837" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
@ -614,7 +682,10 @@
<workItem from="1411428266938" duration="702000" /> <workItem from="1411428266938" duration="702000" />
<workItem from="1411458289707" duration="5043000" /> <workItem from="1411458289707" duration="5043000" />
<workItem from="1411478912746" duration="8911000" /> <workItem from="1411478912746" duration="8911000" />
<workItem from="1412010505310" duration="141000" /> <workItem from="1412010505310" duration="893000" />
<workItem from="1412017601875" duration="1289000" />
<workItem from="1412260550020" duration="61000" />
<workItem from="1412260627794" duration="1375000" />
</task> </task>
<task id="LOCAL-00001" summary="First Commit"> <task id="LOCAL-00001" summary="First Commit">
<created>1411382351159</created> <created>1411382351159</created>
@ -680,15 +751,43 @@
<created>1411491737240</created> <created>1411491737240</created>
<updated>1411491737240</updated> <updated>1411491737240</updated>
</task> </task>
<option name="localTasksCounter" value="17" /> <task id="LOCAL-00017" summary="Forgot to merge... Bleh...">
<created>1412010681095</created>
<updated>1412010681095</updated>
</task>
<task id="LOCAL-00018" summary="Well, I broke it, sorry :(">
<created>1412011248692</created>
<updated>1412011248692</updated>
</task>
<option name="localTasksCounter" value="19" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="31617000" /> <option name="totallyTimeSpent" value="35094000" />
</component>
<component name="TodoView" selected-index="0">
<todo-panel id="selected-file">
<are-packages-shown value="false" />
<are-modules-shown value="false" />
<flatten-packages value="false" />
<is-autoscroll-to-source value="true" />
</todo-panel>
<todo-panel id="all">
<are-packages-shown value="true" />
<are-modules-shown value="false" />
<flatten-packages value="false" />
<is-autoscroll-to-source value="true" />
</todo-panel>
<todo-panel id="default-changelist">
<are-packages-shown value="false" />
<are-modules-shown value="false" />
<flatten-packages value="false" />
<is-autoscroll-to-source value="false" />
</todo-panel>
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-6" y="-6" width="1378" height="750" extended-state="6" /> <frame x="-6" y="-6" width="1378" height="750" extended-state="6" />
<editor active="true" /> <editor active="false" />
<layout> <layout>
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@ -701,8 +800,8 @@
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3291536" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3291536" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3291536" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32868218" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.20775194" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
@ -713,7 +812,7 @@
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3291536" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32868218" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
</layout> </layout>
@ -746,7 +845,9 @@
<MESSAGE value="I like pretty configs." /> <MESSAGE value="I like pretty configs." />
<MESSAGE value="Attempt to fix db, might not always work. We got to add a warning to spigot." /> <MESSAGE value="Attempt to fix db, might not always work. We got to add a warning to spigot." />
<MESSAGE value="Improved flag system." /> <MESSAGE value="Improved flag system." />
<option name="LAST_COMMIT_MESSAGE" value="Improved flag system." /> <MESSAGE value="Forgot to merge... Bleh..." />
<MESSAGE value="Well, I broke it, sorry :(" />
<option name="LAST_COMMIT_MESSAGE" value="Well, I broke it, sorry :(" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
@ -758,50 +859,6 @@
<option name="FILTER_TARGETS" value="false" /> <option name="FILTER_TARGETS" value="false" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotId.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="68" max-vertical-offset="629">
<caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Plot.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2941" max-vertical-offset="4182">
<caret line="173" column="29" selection-start-line="173" selection-start-column="29" selection-end-line="173" selection-end-column="29" />
</state>
</provider>
</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.0" vertical-offset="7089" max-vertical-offset="11798">
<caret line="442" column="0" selection-start-line="442" selection-start-column="0" selection-end-line="448" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/ConsoleColors.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="136" max-vertical-offset="1598">
<caret line="42" column="40" selection-start-line="42" selection-start-column="40" selection-end-line="42" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/plotsquared.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="408" max-vertical-offset="2856">
<caret line="24" column="30" selection-start-line="24" selection-start-column="30" selection-end-line="24" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Settings.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="374" max-vertical-offset="1241">
<caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.idea/compiler.xml"> <entry file="file://$PROJECT_DIR$/.idea/compiler.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="493"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="493">
@ -838,14 +895,14 @@
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/README.md"> <entry file="file://$PROJECT_DIR$/README.md">
<provider editor-type-id="MarkdownPreviewEditor">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.05654102" vertical-offset="0" max-vertical-offset="902"> <state vertical-scroll-proportion="0.05654102" vertical-offset="0" max-vertical-offset="902">
<caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" /> <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
</state> </state>
</provider> </provider>
<provider editor-type-id="MarkdownPreviewEditor">
<state />
</provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.idea/encodings.xml"> <entry file="file://$PROJECT_DIR$/.idea/encodings.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
@ -908,7 +965,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="15" max-vertical-offset="1785"> <state vertical-scroll-proportion="0.0" vertical-offset="15" max-vertical-offset="1785">
<caret line="51" column="56" selection-start-line="51" selection-start-column="56" selection-end-line="51" selection-end-column="56" /> <caret line="51" column="56" selection-start-line="51" selection-start-column="56" selection-end-line="51" selection-end-column="56" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -916,7 +972,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1224"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1224">
<caret line="58" column="69" selection-start-line="58" selection-start-column="69" selection-end-line="58" selection-end-column="69" /> <caret line="58" column="69" selection-start-line="58" selection-start-column="69" selection-end-line="58" selection-end-column="69" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -970,19 +1025,10 @@
</state> </state>
</provider> </provider>
</entry> </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.0" vertical-offset="1785" max-vertical-offset="14110">
<caret line="32" column="41" selection-start-line="32" selection-start-column="41" selection-end-line="32" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Claim.java"> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Claim.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="559" max-vertical-offset="1173"> <state vertical-scroll-proportion="0.0" vertical-offset="559" max-vertical-offset="1173">
<caret line="63" column="35" selection-start-line="63" selection-start-column="35" selection-end-line="63" selection-end-column="35" /> <caret line="63" column="35" selection-start-line="63" selection-start-column="35" selection-end-line="63" selection-end-column="35" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -997,7 +1043,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1275" max-vertical-offset="3808"> <state vertical-scroll-proportion="0.0" vertical-offset="1275" max-vertical-offset="3808">
<caret line="91" column="5" selection-start-line="91" selection-start-column="5" selection-end-line="91" selection-end-column="5" /> <caret line="91" column="5" selection-start-line="91" selection-start-column="5" selection-end-line="91" selection-end-column="5" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1022,18 +1067,10 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/FlagManager.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="15" max-vertical-offset="867">
<caret line="31" column="44" selection-start-line="31" selection-start-column="44" selection-end-line="31" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotSettings.java"> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotSettings.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2482"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2482">
<caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" /> <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1041,7 +1078,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3604"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3604">
<caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" /> <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1056,7 +1092,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1364" max-vertical-offset="8364"> <state vertical-scroll-proportion="0.0" vertical-offset="1364" max-vertical-offset="8364">
<caret line="117" column="78" selection-start-line="117" selection-start-column="78" selection-end-line="117" selection-end-column="78" /> <caret line="117" column="78" selection-start-line="117" selection-start-column="78" selection-end-line="117" selection-end-column="78" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1064,15 +1099,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="170" max-vertical-offset="7089"> <state vertical-scroll-proportion="0.0" vertical-offset="170" max-vertical-offset="7089">
<caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" /> <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Settings.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="306" max-vertical-offset="1700">
<caret line="18" column="23" selection-start-line="18" selection-start-column="23" selection-end-line="18" selection-end-column="23" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1080,7 +1106,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="102" max-vertical-offset="935"> <state vertical-scroll-proportion="0.0" vertical-offset="102" max-vertical-offset="935">
<caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" /> <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1088,7 +1113,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1700" max-vertical-offset="2601"> <state vertical-scroll-proportion="0.0" vertical-offset="1700" max-vertical-offset="2601">
<caret line="125" column="32" selection-start-line="125" selection-start-column="32" selection-end-line="125" selection-end-column="32" /> <caret line="125" column="32" selection-start-line="125" selection-start-column="32" selection-end-line="125" selection-end-column="32" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1116,14 +1140,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="11339">
<caret line="362" column="86" selection-start-line="362" selection-start-column="86" selection-end-line="362" selection-end-column="86" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/api/PlotAPI.java"> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/api/PlotAPI.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1853" max-vertical-offset="4488"> <state vertical-scroll-proportion="0.0" vertical-offset="1853" max-vertical-offset="4488">
@ -1132,17 +1148,138 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Info.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1938" max-vertical-offset="2397">
<caret line="114" column="0" selection-start-line="114" selection-start-column="0" selection-end-line="114" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Debug.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="82" max-vertical-offset="1870">
<caret line="46" column="0" selection-start-line="46" selection-start-column="0" selection-end-line="46" selection-end-column="0" />
<folding />
</state>
</provider>
</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.0" vertical-offset="7773" max-vertical-offset="17306">
<caret line="485" column="0" selection-start-line="485" selection-start-column="0" selection-end-line="485" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Settings.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1121" max-vertical-offset="1581">
<caret line="83" column="52" selection-start-line="83" selection-start-column="52" selection-end-line="83" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="12516" max-vertical-offset="19533">
<caret line="771" column="0" selection-start-line="771" selection-start-column="0" selection-end-line="771" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/FlagManager.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1581">
<caret line="8" column="7" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="38" max-vertical-offset="13277">
<caret line="41" column="28" selection-start-line="41" selection-start-column="28" selection-end-line="41" selection-end-column="28" />
<folding>
<marker date="1412261855581" expanded="true" signature="1593:1664" placeholder="UPDATE `plot..." />
<marker date="1412261855581" expanded="true" signature="2509:2567" placeholder="SELECT `id`,..plot..." />
<marker date="1412261855581" expanded="true" signature="6725:6806" placeholder="INSERT INTO ..." />
<marker date="1412261855581" expanded="true" signature="7532:7888" placeholder="CREATE TABLE..plot..." />
<marker date="1412261855581" expanded="true" signature="7919:8076" placeholder="CREATE TABLE..plot_denied..." />
<marker date="1412261855581" expanded="true" signature="8107:8265" placeholder="CREATE TABLE..plot_helpers..." />
<marker date="1412261855581" expanded="true" signature="8296:8454" placeholder="CREATE TABLE..plot_trusted..." />
<marker date="1412261855581" expanded="true" signature="8485:9061" placeholder="CREATE TABLE..plot_settings..." />
<marker date="1412261855581" expanded="true" signature="9130:9252" placeholder="ALTER TABLE `plot_settings`..." />
<marker date="1412261855581" expanded="true" signature="9330:9597" placeholder="CREATE TABLE..plot..." />
<marker date="1412261855581" expanded="true" signature="9628:9750" placeholder="CREATE TABLE..plot_denied..." />
<marker date="1412261855581" expanded="true" signature="9781:9904" placeholder="CREATE TABLE..plot_helpers..." />
<marker date="1412261855581" expanded="true" signature="9935:10058" placeholder="CREATE TABLE..plot_trusted..." />
<marker date="1412261855581" expanded="true" signature="10089:10587" placeholder="CREATE TABLE..plot_settings..." />
<marker date="1412261855581" expanded="true" signature="11133:11185" placeholder="DELETE FROM ..." />
<marker date="1412261855581" expanded="true" signature="11361:11412" placeholder="DELETE FROM ..." />
<marker date="1412261855581" expanded="true" signature="11588:11639" placeholder="DELETE FROM ..." />
<marker date="1412261855581" expanded="true" signature="11815:11848" placeholder="DELETE FROM ..." />
<marker date="1412261855581" expanded="true" signature="12563:12621" placeholder="INSERT INTO ..." />
<marker date="1412261855581" expanded="true" signature="13034:13138" placeholder="SELECT `id` ..plot..." />
<marker date="1412261855581" expanded="true" signature="14837:15175" placeholder="UPDATE `plot..." />
<marker date="1412261855581" expanded="true" signature="15215:15233" placeholder="ALTER TABLE `plot`..." />
<marker date="1412261855581" expanded="true" signature="15662:15723" placeholder="ALTER TABLE `plot_settings`..." />
<marker date="1412261855581" expanded="true" signature="16171:16238" placeholder="SELECT `id`,..plot..." />
<marker date="1412261855581" expanded="true" signature="20491:20553" placeholder="UPDATE `plot..." />
<marker date="1412261855581" expanded="true" signature="21448:21512" placeholder="UPDATE `plot..." />
<marker date="1412261855581" expanded="true" signature="22521:22584" placeholder="UPDATE `plot..." />
<marker date="1412261855581" expanded="true" signature="23404:23468" placeholder="UPDATE `plot..." />
<marker date="1412261855581" expanded="true" signature="24505:24572" placeholder="UPDATE `plot..." />
<marker date="1412261855581" expanded="true" signature="25271:25325" placeholder="SELECT * FRO..plot_settings..." />
<marker date="1412261855581" expanded="true" signature="27028:27090" placeholder="SELECT `user..plot_denied..." />
<marker date="1412261855581" expanded="true" signature="27830:27892" placeholder="SELECT `user..plot_helpers..." />
<marker date="1412261855581" expanded="true" signature="28567:28629" placeholder="SELECT `user..plot_trusted..." />
<marker date="1412261855581" expanded="true" signature="29358:29429" placeholder="DELETE FROM ..." />
<marker date="1412261855581" expanded="true" signature="30244:30315" placeholder="DELETE FROM ..." />
<marker date="1412261855581" expanded="true" signature="31128:31196" placeholder="INSERT INTO ..." />
<marker date="1412261855581" expanded="true" signature="32005:32073" placeholder="INSERT INTO ..." />
<marker date="1412261855581" expanded="true" signature="32886:32956" placeholder="DELETE FROM ..." />
<marker date="1412261855581" expanded="true" signature="33763:33830" placeholder="INSERT INTO ..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/PlotMeConverter.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2460" max-vertical-offset="2941">
<caret line="176" column="103" selection-start-line="176" selection-start-column="103" selection-end-line="176" selection-end-column="103" />
<folding>
<element signature="e#1097#10140#0" expanded="true" />
<element signature="e#1258#1294#0" expanded="true" />
<element signature="e#1357#1371#0" expanded="true" />
<element signature="e#10129#10130#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Auto.java"> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Auto.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="3.7777777" vertical-offset="0" max-vertical-offset="2346"> <state vertical-scroll-proportion="0.0" vertical-offset="1156" max-vertical-offset="2074">
<caret line="132" column="1" selection-start-line="132" selection-start-column="1" selection-end-line="132" selection-end-column="1" /> <caret line="94" column="23" selection-start-line="94" selection-start-column="23" selection-end-line="94" selection-end-column="23" />
<folding> <folding />
<element signature="e#0#5049#0" expanded="true" /> </state>
<element signature="imports" expanded="true" /> </provider>
<element signature="e#719#751#0" expanded="true" /> </entry>
<element signature="e#809#810#0" expanded="true" /> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Command.java">
<element signature="e#917#918#0" expanded="true" /> <provider selected="true" editor-type-id="text-editor">
</folding> <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="2771">
<caret line="18" column="7" selection-start-line="18" selection-start-column="7" selection-end-line="18" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Set.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="1.6353468" vertical-offset="0" max-vertical-offset="6511">
<caret line="67" column="9" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>

34
PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java
View File

@ -9,19 +9,17 @@
package com.intellectualcrafters.plot; package com.intellectualcrafters.plot;
import com.google.common.collect.SetMultimap;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
import com.sk89q.worldedit.blocks.ClothColor.ID;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.block.Biome; import org.bukkit.block.Biome;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;
import org.bukkit.block.Sign; import org.bukkit.block.Sign;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.material.MaterialData;
import java.io.File;
import java.util.*; import java.util.*;
/** /**
@ -442,10 +440,10 @@ public class PlotHelper {
return x; return x;
} }
public static double getWorldFolderSize() { public static double getWorldFolderSize(World world) {
// long size = //long size = FileUtil.sizeOfDirectory(world.getWorldFolder());
// FileUtils.sizeOfDirectory(Bukkit.getWorld(Settings.PLOT_WORLD).getWorldFolder()); File folder = world.getWorldFolder();
long size = 10; long size = folder.length();
return (((size) / 1024) / 1024); return (((size) / 1024) / 1024);
} }
@ -728,6 +726,22 @@ public class PlotHelper {
return new short[] { Short.parseShort(block), 0 }; return new short[] { Short.parseShort(block), 0 };
} }
public static void teleportPlayers(World world, Plot plot, boolean tile) {
final Location pos1 = getPlotBottomLoc(world, plot.id).add(1, 0, 1);
final Location pos2 = getPlotTopLoc(world, plot.id);
for (int i = (pos2.getBlockX() / 16) * 16; i < 16 + (pos2. getBlockX() / 16) * 16; i= 16) {
for (int j = (pos1. getBlockZ() / 16) * 16; j < 16 + (pos2.getBlockZ() / 16) * 16; j += 16) {
Chunk chunk = world.getChunkAt(i, j);
for (Entity entity : chunk.getEntities()) {
PlotId id = PlayerFunctions.getPlot(entity.getLocation());
if(id != null && id.equals(plot.id) && entity.getType() == EntityType.PLAYER) {
entity.teleport(world.getSpawnLocation());
// Should this teleport them to floor instead?
}
}
}
}
}
public static void clearAllEntities(World world, Plot plot, boolean tile) { public static void clearAllEntities(World world, Plot plot, boolean tile) {
final Location pos1 = getPlotBottomLoc(world, plot.id).add(1, 0, 1); final Location pos1 = getPlotBottomLoc(world, plot.id).add(1, 0, 1);
final Location pos2 = getPlotTopLoc(world, plot.id); final Location pos2 = getPlotTopLoc(world, plot.id);
@ -756,13 +770,13 @@ public class PlotHelper {
*/ */
public static void clear(final Player requester, final Plot plot) { public static void clear(final Player requester, final Plot plot) {
// TODO teleport any players underground to the surface
final long start = System.nanoTime(); final long start = System.nanoTime();
final World world = requester.getWorld(); final World world = requester.getWorld();
// clear entities: // clear entities:
clearAllEntities(world, plot, false); clearAllEntities(world, plot, false);
//teleport players
teleportPlayers(world, plot, false);
final PlotWorld plotworld = PlotMain.getWorldSettings(world); final PlotWorld plotworld = PlotMain.getWorldSettings(world);
PlotHelper.setBiome(requester.getWorld(), plot, Biome.FOREST); PlotHelper.setBiome(requester.getWorld(), plot, Biome.FOREST);

5
PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java
View File

@ -110,10 +110,6 @@ public class PlotMain extends JavaPlugin {
return new WorldGenerator(worldname); return new WorldGenerator(worldname);
} }
/**
* TODO: Implement better system
*
*/
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public static void checkForExpiredPlots() { public static void checkForExpiredPlots() {
final JavaPlugin plugin = PlotMain.getMain(); final JavaPlugin plugin = PlotMain.getMain();
@ -488,7 +484,6 @@ public class PlotMain extends JavaPlugin {
} }
} }
// TODO make this configurable
PlotWorld.BLOCKS = new ArrayList<>(Arrays.asList(new Material[] { ACACIA_STAIRS, BEACON, BEDROCK, BIRCH_WOOD_STAIRS, BOOKSHELF, BREWING_STAND, BRICK, BRICK_STAIRS, BURNING_FURNACE, CAKE_BLOCK, CAULDRON, CLAY_BRICK, CLAY, COAL_BLOCK, COAL_ORE, COBBLE_WALL, COBBLESTONE, COBBLESTONE_STAIRS, COMMAND, DARK_OAK_STAIRS, DAYLIGHT_DETECTOR, DIAMOND_ORE, DIAMOND_BLOCK, DIRT, DISPENSER, DROPPER, EMERALD_BLOCK, EMERALD_ORE, ENCHANTMENT_TABLE, ENDER_PORTAL_FRAME, ENDER_STONE, FURNACE, GLOWSTONE, GOLD_ORE, GOLD_BLOCK, GRASS, GRAVEL, GLASS, HARD_CLAY, HAY_BLOCK, HUGE_MUSHROOM_1, HUGE_MUSHROOM_2, IRON_BLOCK, IRON_ORE, JACK_O_LANTERN, JUKEBOX, JUNGLE_WOOD_STAIRS, LAPIS_BLOCK, LAPIS_ORE, LEAVES, LEAVES_2, LOG, LOG_2, MELON_BLOCK, MOB_SPAWNER, MOSSY_COBBLESTONE, MYCEL, NETHER_BRICK, NETHER_BRICK_STAIRS, NETHERRACK, NOTE_BLOCK, OBSIDIAN, PACKED_ICE, PUMPKIN, QUARTZ_BLOCK, QUARTZ_ORE, QUARTZ_STAIRS, REDSTONE_BLOCK, SANDSTONE, SAND, SANDSTONE_STAIRS, SMOOTH_BRICK, SMOOTH_STAIRS, SNOW_BLOCK, PlotWorld.BLOCKS = new ArrayList<>(Arrays.asList(new Material[] { ACACIA_STAIRS, BEACON, BEDROCK, BIRCH_WOOD_STAIRS, BOOKSHELF, BREWING_STAND, BRICK, BRICK_STAIRS, BURNING_FURNACE, CAKE_BLOCK, CAULDRON, CLAY_BRICK, CLAY, COAL_BLOCK, COAL_ORE, COBBLE_WALL, COBBLESTONE, COBBLESTONE_STAIRS, COMMAND, DARK_OAK_STAIRS, DAYLIGHT_DETECTOR, DIAMOND_ORE, DIAMOND_BLOCK, DIRT, DISPENSER, DROPPER, EMERALD_BLOCK, EMERALD_ORE, ENCHANTMENT_TABLE, ENDER_PORTAL_FRAME, ENDER_STONE, FURNACE, GLOWSTONE, GOLD_ORE, GOLD_BLOCK, GRASS, GRAVEL, GLASS, HARD_CLAY, HAY_BLOCK, HUGE_MUSHROOM_1, HUGE_MUSHROOM_2, IRON_BLOCK, IRON_ORE, JACK_O_LANTERN, JUKEBOX, JUNGLE_WOOD_STAIRS, LAPIS_BLOCK, LAPIS_ORE, LEAVES, LEAVES_2, LOG, LOG_2, MELON_BLOCK, MOB_SPAWNER, MOSSY_COBBLESTONE, MYCEL, NETHER_BRICK, NETHER_BRICK_STAIRS, NETHERRACK, NOTE_BLOCK, OBSIDIAN, PACKED_ICE, PUMPKIN, QUARTZ_BLOCK, QUARTZ_ORE, QUARTZ_STAIRS, REDSTONE_BLOCK, SANDSTONE, SAND, SANDSTONE_STAIRS, SMOOTH_BRICK, SMOOTH_STAIRS, SNOW_BLOCK,
SOUL_SAND, SPONGE, SPRUCE_WOOD_STAIRS, STONE, WOOD, WOOD_STAIRS, WORKBENCH, WOOL, getMaterial(44), getMaterial(126) })); SOUL_SAND, SPONGE, SPRUCE_WOOD_STAIRS, STONE, WOOD, WOOD_STAIRS, WORKBENCH, WOOL, getMaterial(44), getMaterial(126) }));
if (Settings.KILL_ROAD_MOBS) { if (Settings.KILL_ROAD_MOBS) {

2
PlotSquared/src/com/intellectualcrafters/plot/Settings.java
View File

@ -81,7 +81,7 @@ public class Settings {
* *
*/ */
public static class DB { public static class DB {
public static boolean USE_MONGO = false; /* TODO: Implement Mongo */; public static boolean USE_MONGO = false; /* TODO: Implement Mongo @Brandon */;
public static boolean USE_SQLITE = false; public static boolean USE_SQLITE = false;
public static boolean USE_MYSQL = true; /* NOTE: Fixed connector */ public static boolean USE_MYSQL = true; /* NOTE: Fixed connector */
public static String SQLITE_DB = "storage"; public static String SQLITE_DB = "storage";

1
PlotSquared/src/com/intellectualcrafters/plot/commands/Auto.java
View File

@ -93,6 +93,7 @@ public class Auto extends SubCommand {
PlotId end = new PlotId(x+size_x-1, z+size_z-1); PlotId end = new PlotId(x+size_x-1, z+size_z-1);
if (isUnowned(world, start, end)) { if (isUnowned(world, start, end)) {
// TODO claim event // TODO claim event
// Claim.claimPlot calls that event...
for (int i = start.x; i <= end.x; i++) { for (int i = start.x; i <= end.x; i++) {
for (int j = start.y; j <= end.y; j++) { for (int j = start.y; j <= end.y; j++) {
Plot plot = PlotHelper.getPlot(world, new PlotId(i,j)); Plot plot = PlotHelper.getPlot(world, new PlotId(i,j));

14
PlotSquared/src/com/intellectualcrafters/plot/commands/Debug.java
View File

@ -9,15 +9,10 @@
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.*;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import com.intellectualcrafters.plot.C;
import com.intellectualcrafters.plot.Lag;
import com.intellectualcrafters.plot.PlayerFunctions;
import com.intellectualcrafters.plot.PlotHelper;
import com.intellectualcrafters.plot.PlotMain;
import com.intellectualcrafters.plot.RUtils;
/** /**
* @author Citymonstret \\SuperCharged Compiler made by Citymonstret\\ * @author Citymonstret \\SuperCharged Compiler made by Citymonstret\\
* ||#Compiler:ALPHA-1.0######################### * ||#Compiler:ALPHA-1.0#########################
@ -85,7 +80,10 @@ public class Debug extends SubCommand {
information.append(getSection(section, "PlotWorld")); information.append(getSection(section, "PlotWorld"));
information.append(getLine(line, "Plot Worlds", worlds)); information.append(getLine(line, "Plot Worlds", worlds));
information.append(getLine(line, "Owned Plots", PlotMain.getPlots().size())); information.append(getLine(line, "Owned Plots", PlotMain.getPlots().size()));
information.append(getLine(line, "PlotWorld Size", PlotHelper.getWorldFolderSize() + "MB")); //information.append(getLine(line, "PlotWorld Size", PlotHelper.getWorldFolderSize() + "MB"));
for(String world : PlotMain.getPlotWorlds()) {
information.append(getLine(line, "World: " + world + " size", PlotHelper.getWorldFolderSize(Bukkit.getWorld(world))));
}
information.append(getLine(line, "Entities", PlotHelper.getEntities(plr.getWorld()))); information.append(getLine(line, "Entities", PlotHelper.getEntities(plr.getWorld())));
information.append(getLine(line, "Loaded Tile Entities", PlotHelper.getTileEntities(plr.getWorld()))); information.append(getLine(line, "Loaded Tile Entities", PlotHelper.getTileEntities(plr.getWorld())));
information.append(getLine(line, "Loaded Chunks", PlotHelper.getLoadedChunks(plr.getWorld()))); information.append(getLine(line, "Loaded Chunks", PlotHelper.getLoadedChunks(plr.getWorld())));

19
PlotSquared/src/com/intellectualcrafters/plot/commands/Info.java
View File

@ -9,9 +9,11 @@
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import java.util.ArrayList; import com.intellectualcrafters.plot.C;
import java.util.UUID; import com.intellectualcrafters.plot.PlayerFunctions;
import com.intellectualcrafters.plot.Plot;
import com.intellectualcrafters.plot.PlotHelper;
import com.intellectualcrafters.plot.database.DBFunc;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
@ -20,11 +22,8 @@ import org.bukkit.World;
import org.bukkit.block.Biome; import org.bukkit.block.Biome;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import com.intellectualcrafters.plot.C; import java.util.ArrayList;
import com.intellectualcrafters.plot.PlayerFunctions; import java.util.UUID;
import com.intellectualcrafters.plot.Plot;
import com.intellectualcrafters.plot.PlotHelper;
import com.intellectualcrafters.plot.database.DBFunc;
/** /**
* *
@ -92,8 +91,8 @@ public class Info extends SubCommand {
info = info.replaceAll("%trusted%", getPlayerList(plot.trusted)); info = info.replaceAll("%trusted%", getPlayerList(plot.trusted));
info = info.replaceAll("%denied%", getPlayerList(plot.denied)); info = info.replaceAll("%denied%", getPlayerList(plot.denied));
info = info.replaceAll("%flags%", StringUtils.join(plot.settings.getFlags(), "").length() > 0 ? StringUtils.join(plot.settings.getFlags(), ",") : "none"); info = info.replaceAll("%flags%", StringUtils.join(plot.settings.getFlags(), "").length() > 0 ? StringUtils.join(plot.settings.getFlags(), ",") : "none");
PlayerFunctions.sendMessage(player, PlayerFunctions.getTopPlot(player.getWorld(), plot).id.toString()); //PlayerFunctions.sendMessage(player, PlayerFunctions.getTopPlot(player.getWorld(), plot).id.toString());
PlayerFunctions.sendMessage(player, PlayerFunctions.getBottomPlot(player.getWorld(), plot).id.toString()); //PlayerFunctions.sendMessage(player, PlayerFunctions.getBottomPlot(player.getWorld(), plot).id.toString());
PlayerFunctions.sendMessage(player, info); PlayerFunctions.sendMessage(player, info);
return true; return true;
} }

2
PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java
View File

@ -39,7 +39,7 @@ import com.intellectualcrafters.plot.PlotMain;
*/ */
public class DBFunc { public class DBFunc {
// TODO MongoDB // TODO MongoDB @Brandon
/** /**
* Set Plot owner * Set Plot owner

27
PlotSquared/src/com/intellectualcrafters/plot/database/PlotMeConverter.java
View File

@ -1,5 +1,14 @@
package com.intellectualcrafters.plot.database; package com.intellectualcrafters.plot.database;
import com.intellectualcrafters.plot.PlotHomePosition;
import com.intellectualcrafters.plot.PlotId;
import com.intellectualcrafters.plot.PlotMain;
import com.worldcretornica.plotme.PlayerList;
import com.worldcretornica.plotme.Plot;
import com.worldcretornica.plotme.PlotManager;
import org.bukkit.Bukkit;
import org.bukkit.World;
import java.io.PrintStream; import java.io.PrintStream;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
@ -7,19 +16,6 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import org.bukkit.Bukkit;
import org.bukkit.World;
import com.intellectualcrafters.plot.PlotHomePosition;
import com.intellectualcrafters.plot.PlotId;
import com.intellectualcrafters.plot.PlotMain;
import com.intellectualcrafters.plot.api.PlotAPI;
import com.sun.org.apache.xerces.internal.impl.dv.DVFactoryException;
import com.worldcretornica.plotme.PlayerList;
import com.worldcretornica.plotme.Plot;
import com.worldcretornica.plotme.PlotManager;
import com.worldcretornica.plotme.PlotMe;
/** /**
* Created by Citymonstret on 2014-08-17. * Created by Citymonstret on 2014-08-17.
*/ */
@ -32,6 +28,10 @@ public class PlotMeConverter {
} }
public void runAsync() throws Exception { public void runAsync() throws Exception {
/* TODO Fix this... */
boolean offlineMode = Bukkit.getOnlineMode();
final PrintStream stream = new PrintStream("converter_log.txt"); final PrintStream stream = new PrintStream("converter_log.txt");
PlotMain.sendConsoleSenderMessage("PlotMe->PlotSquared Conversion has started"); PlotMain.sendConsoleSenderMessage("PlotMe->PlotSquared Conversion has started");
@ -174,6 +174,7 @@ public class PlotMeConverter {
// TODO disable PlotMe -> Unload all plot worlds, change the generator, restart the server automatically // TODO disable PlotMe -> Unload all plot worlds, change the generator, restart the server automatically
// Possibly use multiverse / multiworld if it's to difficult modifying a world's generator while the server is running // Possibly use multiverse / multiworld if it's to difficult modifying a world's generator while the server is running
// Should really do that? Would seem pretty bad from our side + bukkit wouldn't approve
Bukkit.getPluginManager().disablePlugin(PlotMeConverter.this.plugin); Bukkit.getPluginManager().disablePlugin(PlotMeConverter.this.plugin);
} }