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

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	PlotSquared/src/com/intellectualcrafters/plot/commands/Schematic.java
This commit is contained in:
boy0001 2014-10-26 11:07:12 +11:00
commit 3938184655
11 changed files with 207 additions and 658 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

550
.idea/workspace.xml
View File

@ -9,13 +9,8 @@
</artifacts-to-build> </artifacts-to-build>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="f6aaf715-4424-4f9e-96dc-b47edea10520" name="Default" comment="* Added Fly Flag&#10;* Moved stuff away from the actual listener class&#10;* Ability to delete plot on player ban"> <list default="true" id="f6aaf715-4424-4f9e-96dc-b47edea10520" name="Default" comment="">
<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/Flag.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Flag.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerEnterPlotEvent.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerEnterPlotEvent.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerLeavePlotEvent.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerLeavePlotEvent.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerPlotDeniedEvent.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerPlotDeniedEvent.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerPlotHelperEvent.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerPlotHelperEvent.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerPlotTrustedEvent.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerPlotTrustedEvent.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" />
@ -39,108 +34,91 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file leaf-file-name="DBFunc.java" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="PlayerEvents.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/listeners/PlayerEvents.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="3213"> <state vertical-scroll-proportion="0.0" vertical-offset="6885" max-vertical-offset="13311">
<caret line="17" column="21" selection-start-line="17" selection-start-column="21" selection-end-line="17" selection-end-column="21" /> <caret line="405" column="35" selection-start-line="407" selection-start-column="33" selection-end-line="407" selection-end-column="35" />
<folding>
<marker date="1414069739244" expanded="true" signature="1052:1174" placeholder="ALTER TABLE `plot_settings`..." />
<marker date="1414069739244" expanded="true" signature="1227:1254" placeholder="DELETE FROM ..." />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PlayerEnterPlotEvent.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerEnterPlotEvent.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="31" max-vertical-offset="765">
<caret line="33" column="27" selection-start-line="33" selection-start-column="27" selection-end-line="33" selection-end-column="27" />
<folding>
<element signature="e#705#706#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PlotMergeEvent.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlotMergeEvent.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="335" max-vertical-offset="986">
<caret line="64" column="0" selection-start-line="64" selection-start-column="0" selection-end-line="71" selection-end-column="5" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="PlayerClaimPlotEvent.java" pinned="false" current="true" current-in-tab="true"> <file leaf-file-name="PlayerClaimPlotEvent.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerClaimPlotEvent.java"> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerClaimPlotEvent.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.6406504" vertical-offset="235" max-vertical-offset="850"> <state vertical-scroll-proportion="0.0" vertical-offset="510" max-vertical-offset="1224">
<caret line="55" column="0" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" /> <caret line="30" column="14" selection-start-line="30" selection-start-column="14" selection-end-line="30" selection-end-column="14" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="PlayerLeavePlotEvent.java" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="PlotListener.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerLeavePlotEvent.java"> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlotListener.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="14" max-vertical-offset="731"> <state vertical-scroll-proportion="0.0" vertical-offset="3026" max-vertical-offset="3468">
<caret line="43" column="5" selection-start-line="43" selection-start-column="5" selection-end-line="43" selection-end-column="5" /> <caret line="178" column="9" selection-start-line="178" selection-start-column="9" selection-end-line="178" selection-end-column="9" />
<folding> <folding />
<element signature="e#681#682#0" expanded="true" />
<element signature="e#704#705#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="PlayerPlotDeniedEvent.java" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="Set.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerPlotDeniedEvent.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="0.0" vertical-offset="539" max-vertical-offset="1224"> <state vertical-scroll-proportion="0.0" vertical-offset="2941" max-vertical-offset="7259">
<caret line="79" column="5" selection-start-line="79" selection-start-column="5" selection-end-line="79" selection-end-column="5" /> <caret line="173" column="0" selection-start-line="173" selection-start-column="0" selection-end-line="173" selection-end-column="0" />
<folding> <folding />
<element signature="e#1264#1265#0" expanded="true" />
<element signature="e#1292#1293#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="PlayerPlotHelperEvent.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/events/PlayerPlotHelperEvent.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="524" max-vertical-offset="1207"> <state vertical-scroll-proportion="0.0" vertical-offset="16862" max-vertical-offset="22746">
<caret line="78" column="5" selection-start-line="78" selection-start-column="5" selection-end-line="78" selection-end-column="5" /> <caret line="953" column="34" selection-start-line="953" selection-start-column="34" selection-end-line="953" selection-end-column="34" />
<folding> <folding />
<element signature="e#1247#1248#0" expanded="true" />
<element signature="e#1275#1276#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="PlayerPlotTrustedEvent.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/events/PlayerPlotTrustedEvent.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="524" max-vertical-offset="1207"> <state vertical-scroll-proportion="0.0" vertical-offset="51" max-vertical-offset="2448">
<caret line="78" column="5" selection-start-line="78" selection-start-column="5" selection-end-line="78" selection-end-column="5" /> <caret line="71" column="9" selection-start-line="71" selection-start-column="9" selection-end-line="71" selection-end-column="9" />
<folding> <folding />
<element signature="e#1256#1257#0" expanded="true" />
<element signature="e#1284#1285#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="PlayerTeleportToPlotEvent.java" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="Flag.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerTeleportToPlotEvent.java"> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Flag.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="422" max-vertical-offset="1037"> <state vertical-scroll-proportion="0.44526315" vertical-offset="36" max-vertical-offset="1598">
<caret line="65" column="0" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" /> <caret line="27" column="33" selection-start-line="27" selection-start-column="33" selection-end-line="27" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Schematic.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Schematic.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="3028" max-vertical-offset="4267">
<caret line="242" column="108" selection-start-line="242" selection-start-column="108" selection-end-line="242" selection-end-column="108" />
<folding />
</state>
</provider>
</entry>
</file>
<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">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="289" max-vertical-offset="1700">
<caret line="17" column="68" selection-start-line="17" selection-start-column="68" selection-end-line="17" selection-end-column="68" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -149,7 +127,7 @@
<file leaf-file-name="PlotClearEvent.java" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="PlotClearEvent.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlotClearEvent.java"> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlotClearEvent.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="371" max-vertical-offset="986"> <state vertical-scroll-proportion="0.0" vertical-offset="833" max-vertical-offset="1377">
<caret line="49" column="7" selection-start-line="49" selection-start-column="7" selection-end-line="49" selection-end-column="7" /> <caret line="49" column="7" selection-start-line="49" selection-start-column="7" selection-end-line="49" selection-end-column="7" />
<folding /> <folding />
</state> </state>
@ -169,7 +147,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="changedFiles"> <option name="changedFiles">
<list> <list>
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Claim.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" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Merge.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Merge.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Denied.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Denied.java" />
@ -181,7 +158,6 @@
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/generator/DefaultPlotWorld.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/generator/DefaultPlotWorld.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Delete.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Delete.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/generator/DefaultPlotManager.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/generator/DefaultPlotManager.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Schematic.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/plugin.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/plugin.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/TP.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/TP.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/SchematicHandler.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/SchematicHandler.java" />
@ -206,13 +182,9 @@
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/C.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/C.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/listeners/MoveListener.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/listeners/MoveListener.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/listeners/PlotListener.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Comment.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Comment.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/commands/Set.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerEnterPlotEvent.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerEnterPlotEvent.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerLeavePlotEvent.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerLeavePlotEvent.java" />
@ -220,14 +192,20 @@
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerPlotHelperEvent.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerPlotHelperEvent.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerPlotTrustedEvent.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerPlotTrustedEvent.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerTeleportToPlotEvent.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerTeleportToPlotEvent.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlotListener.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Set.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Settings.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Schematic.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Flag.java" />
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="-6" /> <option name="x" value="-6" />
<option name="y" value="-6" /> <option name="y" value="-6" />
<option name="width" value="1378" /> <option name="width" value="1932" />
<option name="height" value="750" /> <option name="height" value="1062" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true"> <component name="ProjectLevelVcsManager" settingsEditedManually="true">
<OptionsSetting value="true" id="Add" /> <OptionsSetting value="true" id="Add" />
@ -260,7 +238,6 @@
<sortByType /> <sortByType />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
@ -306,28 +283,6 @@
<option name="myItemId" value="src" /> <option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="com" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="plot_news" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PlotSquared" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="com" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="intellectualcrafters" /> <option name="myItemId" value="intellectualcrafters" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
@ -350,40 +305,6 @@
<option name="myItemId" value="src" /> <option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="com" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="intellectualcrafters" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="plot" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="events" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="plot_news" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PlotSquared" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="com" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="intellectualcrafters" /> <option name="myItemId" value="intellectualcrafters" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
@ -391,6 +312,7 @@
</PATH> </PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
<pane id="PackagesPane" /> <pane id="PackagesPane" />
</panes> </panes>
</component> </component>
@ -448,137 +370,6 @@
<recent name="C:\Users\Citymonstret\Desktop\workspace\bukkit\plot_news\lib" /> <recent name="C:\Users\Citymonstret\Desktop\workspace\bukkit\plot_news\lib" />
</key> </key>
</component> </component>
<component name="RestoreUpdateTree">
<UpdateInfo date="Moments ago" ActionInfo="_Update">
<UpdatedFiles>
<FILE-GROUP>
<option name="myUpdateName" value="Updated from server" />
<option name="myStatusName" value="Changed on server" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="CHANGED_ON_SERVER" />
<FILE-GROUP>
<option name="myUpdateName" value="Updated" />
<option name="myStatusName" value="Changed" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="UPDATED" />
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/C.java</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Plot.java</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotSelection.java</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/SchematicHandler.java</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Auto.java</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Claim.java</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Clear.java</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Command.java</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Copy.java</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Delete.java</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Kick.java</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/MainCommand.java</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Paste.java</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Set.java</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Unlink.java</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/PlotMeConverter.java</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/plugin.yml</PATH>
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Created" />
<option name="myStatusName" value="Created" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="CREATED" />
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/BlockWrapper.java</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Swap.java</PATH>
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Deleted" />
<option name="myStatusName" value="Deleted" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="true" />
<option name="myId" value="REMOVED_FROM_REPOSITORY" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Restored" />
<option name="myStatusName" value="Will be restored" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="RESTORED" />
</FILE-GROUP>
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Modified" />
<option name="myStatusName" value="Modified" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MODIFIED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Skipped" />
<option name="myStatusName" value="Skipped" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="SKIPPED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Merged with conflicts" />
<option name="myStatusName" value="Will be merged with conflicts" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MERGED_WITH_CONFLICTS" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Merged with tree conflicts" />
<option name="myStatusName" value="Merged with tree conflicts" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Merged with property conflicts" />
<option name="myStatusName" value="Will be merged with property conflicts" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Merged" />
<option name="myStatusName" value="Will be merged" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MERGED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Not in repository" />
<option name="myStatusName" value="Not in repository" />
<option name="mySupportsDeletion" value="true" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="UNKNOWN" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Locally added" />
<option name="myStatusName" value="Locally added" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="LOCALLY_ADDED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Locally removed" />
<option name="myStatusName" value="Locally removed" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="LOCALLY_REMOVED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Switched" />
<option name="myStatusName" value="Switched" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="SWITCHED" />
</FILE-GROUP>
</UpdatedFiles>
</UpdateInfo>
</component>
<component name="RunManager"> <component name="RunManager">
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin"> <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
<module name="" /> <module name="" />
@ -745,7 +536,9 @@
<workItem from="1413814049095" duration="226000" /> <workItem from="1413814049095" duration="226000" />
<workItem from="1413867684355" duration="7963000" /> <workItem from="1413867684355" duration="7963000" />
<workItem from="1413998668219" duration="821000" /> <workItem from="1413998668219" duration="821000" />
<workItem from="1414069303931" duration="655000" /> <workItem from="1414069303931" duration="1255000" />
<workItem from="1414240828250" duration="1959000" />
<workItem from="1414246269225" duration="1384000" />
</task> </task>
<task id="LOCAL-00001" summary="First Commit"> <task id="LOCAL-00001" summary="First Commit">
<created>1411382351159</created> <created>1411382351159</created>
@ -979,11 +772,35 @@
<created>1413998882732</created> <created>1413998882732</created>
<updated>1413998882732</updated> <updated>1413998882732</updated>
</task> </task>
<option name="localTasksCounter" value="59" /> <task id="LOCAL-00059" summary="Fixed events...">
<created>1414069969139</created>
<updated>1414069969139</updated>
</task>
<task id="LOCAL-00060" summary="Attempt to do stuff with flags xD">
<created>1414241164578</created>
<updated>1414241164578</updated>
</task>
<task id="LOCAL-00061" summary="Removed web and fixed the flag sutff">
<created>1414241948369</created>
<updated>1414241948369</updated>
</task>
<task id="LOCAL-00062" summary="Added schematic save path setting">
<created>1414242159105</created>
<updated>1414242159105</updated>
</task>
<task id="LOCAL-00063" summary="Support for colour codes">
<created>1414246513646</created>
<updated>1414246513646</updated>
</task>
<task id="LOCAL-00064" summary="Even better colour (+ character support). You evil person who force stringutil-check-thingies">
<created>1414247437259</created>
<updated>1414247437259</updated>
</task>
<option name="localTasksCounter" value="65" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="114357000" /> <option name="totallyTimeSpent" value="118300000" />
</component> </component>
<component name="TodoView" selected-index="0"> <component name="TodoView" selected-index="0">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
@ -1006,7 +823,7 @@
</todo-panel> </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="1932" height="1062" extended-state="6" />
<editor active="true" /> <editor active="true" />
<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" />
@ -1021,12 +838,12 @@
<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.32882884" 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.32882884" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33033034" 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="false" weight="0.33026585" sideWeight="0.5" order="13" 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.2072072" sideWeight="0.5" order="6" 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.2072072" 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" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2035139" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.203125" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3291536" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3291536" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="IntelliGuard" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> <window_info id="IntelliGuard" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
@ -1081,12 +898,6 @@
<option name="myTodoPanelSettings"> <option name="myTodoPanelSettings">
<TodoPanelSettings /> <TodoPanelSettings />
</option> </option>
<MESSAGE value="Pfft." />
<MESSAGE value="Yer, forgot that :P" />
<MESSAGE value="Copy and paste, doesn't work for mega plots." />
<MESSAGE value="Clipboard command (for info...)" />
<MESSAGE value="Fail :P" />
<MESSAGE value="Fixed some translations." />
<MESSAGE value="Started working on functions that will allow for a saved UUID cache (i.e mysql, sqlite, txt file etc...) for faster reading and in-caching.&#10;" /> <MESSAGE value="Started working on functions that will allow for a saved UUID cache (i.e mysql, sqlite, txt file etc...) for faster reading and in-caching.&#10;" />
<MESSAGE value="Fixed the uuid saving functions, added ability to change caching methods.&#10;" /> <MESSAGE value="Fixed the uuid saving functions, added ability to change caching methods.&#10;" />
<MESSAGE value="Some global settings :D" /> <MESSAGE value="Some global settings :D" />
@ -1106,11 +917,17 @@
<MESSAGE value="* Added Fly Flag&#10;* Moved stuff away from the actual listener class&#10;* Ability to delete plot on player ban" /> <MESSAGE value="* Added Fly Flag&#10;* Moved stuff away from the actual listener class&#10;* Ability to delete plot on player ban" />
<MESSAGE value="Remove le line" /> <MESSAGE value="Remove le line" />
<MESSAGE value="Only display flags which the user is permitted to use." /> <MESSAGE value="Only display flags which the user is permitted to use." />
<option name="LAST_COMMIT_MESSAGE" value="Only display flags which the user is permitted to use." /> <MESSAGE value="Fixed events..." />
<MESSAGE value="Attempt to do stuff with flags xD" />
<MESSAGE value="Removed web and fixed the flag sutff" />
<MESSAGE value="Added schematic save path setting" />
<MESSAGE value="Support for colour codes" />
<MESSAGE value="Even better colour (+ character support). You evil person who force stringutil-check-thingies" />
<option name="LAST_COMMIT_MESSAGE" value="Even better colour (+ character support). You evil person who force stringutil-check-thingies" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
<option name="time" value="3" /> <option name="time" value="4" />
</breakpoint-manager> </breakpoint-manager>
</component> </component>
<component name="antWorkspaceConfiguration"> <component name="antWorkspaceConfiguration">
@ -1118,20 +935,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/generator/WorldGenerator.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="204" max-vertical-offset="9333">
<caret line="39" column="0" selection-start-line="39" selection-start-column="0" selection-end-line="39" selection-end-column="0" />
</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="510" max-vertical-offset="1887">
<caret line="66" column="0" selection-start-line="66" selection-start-column="0" selection-end-line="73" selection-end-column="11" />
</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="0.0" vertical-offset="1139" max-vertical-offset="2856"> <state vertical-scroll-proportion="0.0" vertical-offset="1139" max-vertical-offset="2856">
@ -1276,7 +1079,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="199" max-vertical-offset="2516"> <state vertical-scroll-proportion="0.0" vertical-offset="199" max-vertical-offset="2516">
<caret line="40" column="58" selection-start-line="40" selection-start-column="58" selection-end-line="40" selection-end-column="58" /> <caret line="40" column="58" selection-start-line="40" selection-start-column="58" selection-end-line="40" selection-end-column="58" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1326,7 +1128,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="11538" max-vertical-offset="16082"> <state vertical-scroll-proportion="0.0" vertical-offset="11538" max-vertical-offset="16082">
<caret line="678" column="9" selection-start-line="678" selection-start-column="9" selection-end-line="678" selection-end-column="9" /> <caret line="678" column="9" selection-start-line="678" selection-start-column="9" selection-end-line="678" selection-end-column="9" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1334,7 +1135,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="288" max-vertical-offset="1275"> <state vertical-scroll-proportion="0.0" vertical-offset="288" max-vertical-offset="1275">
<caret line="34" column="28" selection-start-line="34" selection-start-column="28" selection-end-line="34" selection-end-column="28" /> <caret line="34" column="28" selection-start-line="34" selection-start-column="28" selection-end-line="34" selection-end-column="28" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1342,31 +1142,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="545" max-vertical-offset="2941"> <state vertical-scroll-proportion="0.0" vertical-offset="545" max-vertical-offset="2941">
<caret line="108" column="60" selection-start-line="108" selection-start-column="60" selection-end-line="108" selection-end-column="60" /> <caret line="108" column="60" selection-start-line="108" selection-start-column="60" selection-end-line="108" selection-end-column="60" />
<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="429" max-vertical-offset="1666">
<caret line="41" column="36" selection-start-line="41" selection-start-column="36" selection-end-line="41" selection-end-column="36" />
<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="18445" max-vertical-offset="24463">
<caret line="1085" column="43" selection-start-line="1085" selection-start-column="43" selection-end-line="1085" selection-end-column="43" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlotListener.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2519" max-vertical-offset="3145">
<caret line="179" column="0" selection-start-line="179" selection-start-column="0" selection-end-line="179" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1377,35 +1152,10 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1377" max-vertical-offset="13328">
<caret line="81" column="27" selection-start-line="81" selection-start-column="27" selection-end-line="81" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Comment.java"> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Comment.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="280" max-vertical-offset="918"> <state vertical-scroll-proportion="0.0" vertical-offset="280" max-vertical-offset="918">
<caret line="47" column="18" selection-start-line="47" selection-start-column="18" selection-end-line="47" selection-end-column="18" /> <caret line="47" column="18" selection-start-line="47" selection-start-column="18" selection-end-line="47" selection-end-column="18" />
<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="645" max-vertical-offset="2448">
<caret line="72" column="27" selection-start-line="72" selection-start-column="27" selection-end-line="72" selection-end-column="27" />
<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="0.0" vertical-offset="2711" max-vertical-offset="6647">
<caret line="81" column="58" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1413,7 +1163,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.7417722" vertical-offset="234" max-vertical-offset="629"> <state vertical-scroll-proportion="0.7417722" vertical-offset="234" max-vertical-offset="629">
<caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" /> <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1421,10 +1170,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="3213"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3213">
<caret line="17" column="21" selection-start-line="17" selection-start-column="21" selection-end-line="17" selection-end-column="21" /> <caret line="17" column="21" selection-start-line="17" selection-start-column="21" selection-end-line="17" selection-end-column="21" />
<folding>
<marker date="1414069739244" expanded="true" signature="1052:1174" placeholder="ALTER TABLE `plot_settings`..." />
<marker date="1414069739244" expanded="true" signature="1227:1254" placeholder="DELETE FROM ..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1432,7 +1177,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="335" max-vertical-offset="986"> <state vertical-scroll-proportion="0.0" vertical-offset="335" max-vertical-offset="986">
<caret line="64" column="0" selection-start-line="64" selection-start-column="0" selection-end-line="71" selection-end-column="5" /> <caret line="64" column="0" selection-start-line="64" selection-start-column="0" selection-end-line="71" selection-end-column="5" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1440,9 +1184,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="31" max-vertical-offset="765"> <state vertical-scroll-proportion="0.0" vertical-offset="31" max-vertical-offset="765">
<caret line="33" column="27" selection-start-line="33" selection-start-column="27" selection-end-line="33" selection-end-column="27" /> <caret line="33" column="27" selection-start-line="33" selection-start-column="27" selection-end-line="33" selection-end-column="27" />
<folding>
<element signature="e#705#706#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1450,10 +1191,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="14" max-vertical-offset="731"> <state vertical-scroll-proportion="0.0" vertical-offset="14" max-vertical-offset="731">
<caret line="43" column="5" selection-start-line="43" selection-start-column="5" selection-end-line="43" selection-end-column="5" /> <caret line="43" column="5" selection-start-line="43" selection-start-column="5" selection-end-line="43" selection-end-column="5" />
<folding>
<element signature="e#681#682#0" expanded="true" />
<element signature="e#704#705#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1461,10 +1198,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="539" max-vertical-offset="1224"> <state vertical-scroll-proportion="0.0" vertical-offset="539" max-vertical-offset="1224">
<caret line="79" column="5" selection-start-line="79" selection-start-column="5" selection-end-line="79" selection-end-column="5" /> <caret line="79" column="5" selection-start-line="79" selection-start-column="5" selection-end-line="79" selection-end-column="5" />
<folding>
<element signature="e#1264#1265#0" expanded="true" />
<element signature="e#1292#1293#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1472,10 +1205,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="524" max-vertical-offset="1207"> <state vertical-scroll-proportion="0.0" vertical-offset="524" max-vertical-offset="1207">
<caret line="78" column="5" selection-start-line="78" selection-start-column="5" selection-end-line="78" selection-end-column="5" /> <caret line="78" column="5" selection-start-line="78" selection-start-column="5" selection-end-line="78" selection-end-column="5" />
<folding>
<element signature="e#1247#1248#0" expanded="true" />
<element signature="e#1275#1276#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1483,10 +1212,7 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="524" max-vertical-offset="1207"> <state vertical-scroll-proportion="0.0" vertical-offset="524" max-vertical-offset="1207">
<caret line="78" column="5" selection-start-line="78" selection-start-column="5" selection-end-line="78" selection-end-column="5" /> <caret line="78" column="5" selection-start-line="78" selection-start-column="5" selection-end-line="78" selection-end-column="5" />
<folding> <folding />
<element signature="e#1256#1257#0" expanded="true" />
<element signature="e#1284#1285#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1508,8 +1234,72 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerClaimPlotEvent.java"> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerClaimPlotEvent.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.6406504" vertical-offset="235" max-vertical-offset="850"> <state vertical-scroll-proportion="0.0" vertical-offset="175" max-vertical-offset="850">
<caret line="55" column="0" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" /> <caret line="30" column="14" selection-start-line="30" selection-start-column="14" selection-end-line="30" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="6885" max-vertical-offset="13311">
<caret line="405" column="35" selection-start-line="407" selection-start-column="33" selection-end-line="407" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlotListener.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2382" max-vertical-offset="3332">
<caret line="178" column="9" selection-start-line="178" selection-start-column="9" selection-end-line="178" selection-end-column="9" />
<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="0" max-vertical-offset="1598">
<caret line="17" column="68" selection-start-line="17" selection-start-column="68" selection-end-line="17" selection-end-column="68" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Schematic.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1729" max-vertical-offset="4267">
<caret line="242" column="108" selection-start-line="242" selection-start-column="108" selection-end-line="242" selection-end-column="108" />
<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="0.0" vertical-offset="2507" max-vertical-offset="6868">
<caret line="173" column="0" selection-start-line="173" selection-start-column="0" selection-end-line="173" 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="14771" max-vertical-offset="22746">
<caret line="953" column="34" selection-start-line="953" selection-start-column="34" selection-end-line="953" selection-end-column="34" />
<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="51" max-vertical-offset="2448">
<caret line="71" column="9" selection-start-line="71" selection-start-column="9" selection-end-line="71" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Flag.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.44526315" vertical-offset="36" max-vertical-offset="1598">
<caret line="27" column="33" selection-start-line="27" selection-start-column="33" selection-end-line="27" selection-end-column="33" />
<folding /> <folding />
</state> </state>
</provider> </provider>

11
PlotSquared/src/com/intellectualcrafters/plot/Flag.java
View File

@ -1,7 +1,6 @@
package com.intellectualcrafters.plot; package com.intellectualcrafters.plot;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.bukkit.ChatColor;
public class Flag { public class Flag {
private AbstractFlag key; private AbstractFlag key;
@ -21,8 +20,14 @@ public class Flag {
* if you provide inadequate inputs * if you provide inadequate inputs
*/ */
public Flag(AbstractFlag key, String value) { public Flag(AbstractFlag key, String value) {
if (!StringUtils.isAlphanumericSpace(ChatColor.stripColor(ChatColor.translateAlternateColorCodes('&', value)))) { char[] allowedCharacters = new char[] {
throw new IllegalArgumentException("Flag must be alphanumerical"); '[', ']', '(', ')', ',', '_', '-', '.', ',', '?', '!', '&', '§'
};
String tempValue = value;
for(char c : allowedCharacters)
tempValue = tempValue.replace(c, 'c');
if (!StringUtils.isAlphanumericSpace(tempValue)) {
throw new IllegalArgumentException("Flag must be alphanumerical (colours and some special characters are allowed)");
} }
if (value.length() > 48) { if (value.length() > 48) {
throw new IllegalArgumentException("Value must be <= 48 characters"); throw new IllegalArgumentException("Value must be <= 48 characters");

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

@ -9,16 +9,10 @@
package com.intellectualcrafters.plot; package com.intellectualcrafters.plot;
import ca.mera.CameraAPI; import ca.mera.CameraAPI;
import com.intellectualcrafters.plot.Logger.LogLevel; import com.intellectualcrafters.plot.Logger.LogLevel;
import com.intellectualcrafters.plot.Settings.Web;
import com.intellectualcrafters.plot.commands.Camera; import com.intellectualcrafters.plot.commands.Camera;
import com.intellectualcrafters.plot.commands.MainCommand; import com.intellectualcrafters.plot.commands.MainCommand;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.*;
import com.intellectualcrafters.plot.database.MySQL;
import com.intellectualcrafters.plot.database.PlotMeConverter;
import com.intellectualcrafters.plot.database.SQLManager;
import com.intellectualcrafters.plot.database.SQLite;
import com.intellectualcrafters.plot.events.PlayerTeleportToPlotEvent; import com.intellectualcrafters.plot.events.PlayerTeleportToPlotEvent;
import com.intellectualcrafters.plot.events.PlotDeleteEvent; import com.intellectualcrafters.plot.events.PlotDeleteEvent;
import com.intellectualcrafters.plot.generator.DefaultPlotManager; import com.intellectualcrafters.plot.generator.DefaultPlotManager;
@ -31,10 +25,8 @@ import com.intellectualcrafters.plot.uuid.PlotUUIDSaver;
import com.intellectualcrafters.plot.uuid.UUIDSaver; import com.intellectualcrafters.plot.uuid.UUIDSaver;
import com.sk89q.worldedit.bukkit.WorldEditPlugin; import com.sk89q.worldedit.bukkit.WorldEditPlugin;
import com.sk89q.worldguard.bukkit.WorldGuardPlugin; import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
import me.confuser.barapi.BarAPI; import me.confuser.barapi.BarAPI;
import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.economy.Economy;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
@ -718,10 +710,6 @@ public class PlotMain extends JavaPlugin {
useEconomy = (economy != null); useEconomy = (economy != null);
getServer().getScheduler().scheduleSyncRepeatingTask(this, new Lag(), 100L, 1L); getServer().getScheduler().scheduleSyncRepeatingTask(this, new Lag(), 100L, 1L);
if (Web.ENABLED) {
sendConsoleSenderMessage(C.PREFIX.s() + "Web Is not implemented yet. Please bear with us.");
}
try { try {
new SetBlockFast(); new SetBlockFast();
PlotHelper.canSetFast = true; PlotHelper.canSetFast = true;
@ -938,6 +926,7 @@ public class PlotMain extends JavaPlugin {
Settings.AUTO_CLEAR = config.getBoolean("clear.auto.enabled"); Settings.AUTO_CLEAR = config.getBoolean("clear.auto.enabled");
Settings.AUTO_CLEAR_DAYS = config.getInt("clear.auto.days"); Settings.AUTO_CLEAR_DAYS = config.getInt("clear.auto.days");
Settings.DELETE_PLOTS_ON_BAN = config.getBoolean("clear.on.ban"); Settings.DELETE_PLOTS_ON_BAN = config.getBoolean("clear.on.ban");
Settings.SCHEMATIC_SAVE_PATH = config.getString("schematic.save_path");
} }
if (Settings.DEBUG) { if (Settings.DEBUG) {
Map<String, String> settings = new HashMap<>(); Map<String, String> settings = new HashMap<>();
@ -945,12 +934,11 @@ public class PlotMain extends JavaPlugin {
settings.put("Use Metrics", "" + Settings.METRICS); settings.put("Use Metrics", "" + Settings.METRICS);
settings.put("Delete Plots On Ban", "" + Settings.DELETE_PLOTS_ON_BAN); settings.put("Delete Plots On Ban", "" + Settings.DELETE_PLOTS_ON_BAN);
settings.put("Mob Pathfinding", "" + Settings.MOB_PATHFINDING); settings.put("Mob Pathfinding", "" + Settings.MOB_PATHFINDING);
settings.put("Web Enabled", "" + Web.ENABLED);
settings.put("Web Port", "" + Web.PORT);
settings.put("DB Mysql Enabled", "" + Settings.DB.USE_MYSQL); settings.put("DB Mysql Enabled", "" + Settings.DB.USE_MYSQL);
settings.put("DB SQLite Enabled", "" + Settings.DB.USE_SQLITE); settings.put("DB SQLite Enabled", "" + Settings.DB.USE_SQLITE);
settings.put("Auto Clear Enabled", "" + Settings.AUTO_CLEAR); settings.put("Auto Clear Enabled", "" + Settings.AUTO_CLEAR);
settings.put("Auto Clear Days", "" + Settings.AUTO_CLEAR_DAYS); settings.put("Auto Clear Days", "" + Settings.AUTO_CLEAR_DAYS);
settings.put("Schematics Save Path", "" + Settings.SCHEMATIC_SAVE_PATH);
for (Entry<String, String> setting : settings.entrySet()) { for (Entry<String, String> setting : settings.entrySet()) {
sendConsoleSenderMessage(C.PREFIX.s() sendConsoleSenderMessage(C.PREFIX.s()
+ String.format("&cKey: &6%s&c, Value: &6%s", setting.getKey(), setting.getValue())); + String.format("&cKey: &6%s&c, Value: &6%s", setting.getKey(), setting.getValue()));
@ -1077,9 +1065,6 @@ public class PlotMain extends JavaPlugin {
options.put("worldguard.enabled", Settings.WORLDGUARD); options.put("worldguard.enabled", Settings.WORLDGUARD);
options.put("kill_road_mobs", Settings.KILL_ROAD_MOBS_DEFAULT); options.put("kill_road_mobs", Settings.KILL_ROAD_MOBS_DEFAULT);
options.put("mob_pathfinding", Settings.MOB_PATHFINDING_DEFAULT); options.put("mob_pathfinding", Settings.MOB_PATHFINDING_DEFAULT);
options.put("web.enabled", Web.ENABLED);
options.put("web.directory", "/var/www");
options.put("web.port", Web.PORT);
options.put("metrics", true); options.put("metrics", true);
options.put("debug", true); options.put("debug", true);
options.put("clear.auto.enabled", false); options.put("clear.auto.enabled", false);
@ -1096,9 +1081,6 @@ public class PlotMain extends JavaPlugin {
if (Settings.DEBUG) { if (Settings.DEBUG) {
sendConsoleSenderMessage(C.PREFIX.s() + "&6Debug Mode Enabled (Default). Edit the config to turn this off."); sendConsoleSenderMessage(C.PREFIX.s() + "&6Debug Mode Enabled (Default). Edit the config to turn this off.");
} }
Web.ENABLED = config.getBoolean("web.enabled");
Web.PORT = config.getInt("web.port");
Web.PATH = config.getString("web.directory");
Settings.KILL_ROAD_MOBS = config.getBoolean("kill_road_mobs"); Settings.KILL_ROAD_MOBS = config.getBoolean("kill_road_mobs");
Settings.WORLDGUARD = config.getBoolean("worldguard.enabled"); Settings.WORLDGUARD = config.getBoolean("worldguard.enabled");
Settings.MOB_PATHFINDING = config.getBoolean("mob_pathfinding"); Settings.MOB_PATHFINDING = config.getBoolean("mob_pathfinding");
@ -1106,6 +1088,7 @@ public class PlotMain extends JavaPlugin {
Settings.AUTO_CLEAR_DAYS = config.getInt("clear.auto.days"); Settings.AUTO_CLEAR_DAYS = config.getInt("clear.auto.days");
Settings.AUTO_CLEAR = config.getBoolean("clear.auto.enabled"); Settings.AUTO_CLEAR = config.getBoolean("clear.auto.enabled");
Settings.MAX_PLOTS = config.getInt("max_plots"); Settings.MAX_PLOTS = config.getInt("max_plots");
Settings.SCHEMATIC_SAVE_PATH = config.getString("schematics.save_path");
} }
public static void createConfiguration(PlotWorld plotworld) { public static void createConfiguration(PlotWorld plotworld) {

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

@ -15,6 +15,7 @@ package com.intellectualcrafters.plot;
* @author Empire92 * @author Empire92
*/ */
public class Settings { public class Settings {
public static String SCHEMATIC_SAVE_PATH = "/var/www/schematics";
public static int MAX_PLOTS = 20; public static int MAX_PLOTS = 20;
/** /**
* WorldGuard region on claimed plots * WorldGuard region on claimed plots
@ -70,12 +71,6 @@ public class Settings {
public static boolean AUTO_UPDATE = false; public static boolean AUTO_UPDATE = false;
} }
public static class Web {
public static boolean ENABLED = false;
public static int PORT = 9000;
public static String PATH = "/var/www";
}
/** /**
* Database settings * Database settings
* *

25
PlotSquared/src/com/intellectualcrafters/plot/commands/Schematic.java
View File

@ -1,26 +1,13 @@
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import java.util.ArrayList; import com.intellectualcrafters.jnbt.CompoundTag;
import java.util.Collection; import com.intellectualcrafters.plot.*;
import java.util.HashMap;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import com.intellectualcrafters.jnbt.CompoundTag; import java.util.HashMap;
import com.intellectualcrafters.plot.C;
import com.intellectualcrafters.plot.PlayerFunctions;
import com.intellectualcrafters.plot.Plot;
import com.intellectualcrafters.plot.PlotHelper;
import com.intellectualcrafters.plot.PlotId;
import com.intellectualcrafters.plot.PlotMain;
import com.intellectualcrafters.plot.SchematicHandler;
import com.intellectualcrafters.plot.Settings;
import com.intellectualcrafters.plot.UUIDHandler;
import com.intellectualcrafters.plot.database.DBFunc;
import com.sun.org.apache.xerces.internal.impl.xs.identity.ValueStore;
public class Schematic extends SubCommand { public class Schematic extends SubCommand {
@ -160,8 +147,7 @@ public class Schematic extends SubCommand {
@Override @Override
public void run() { public void run() {
PlayerFunctions.sendMessage(plr, "&6ID: "+plot.id); PlayerFunctions.sendMessage(plr, "&6ID: "+plot.id);
boolean result = SchematicHandler.save(sch, Settings.Web.PATH+"/"+plot.id.x+","+plot.id.y+","+worldname+", "+owner+".schematic"); boolean result = SchematicHandler.save(sch, Settings.SCHEMATIC_SAVE_PATH+"/"+plot.id.x+","+plot.id.y+","+worldname+","+owner+".schematic");
if (!result) { if (!result) {
PlayerFunctions.sendMessage(plr, "&7 - Failed to save &c"+plot.id); PlayerFunctions.sendMessage(plr, "&7 - Failed to save &c"+plot.id);
} }
@ -251,8 +237,7 @@ public class Schematic extends SubCommand {
@Override @Override
public void run() { public void run() {
PlayerFunctions.sendMessage(plr, "&6ID: "+plot.id); PlayerFunctions.sendMessage(plr, "&6ID: "+plot.id);
boolean result = SchematicHandler.save(sch, Settings.Web.PATH+"/"+plot.id.x+","+plot.id.y+","+world+","+owner+".schematic"); boolean result = SchematicHandler.save(sch, Settings.SCHEMATIC_SAVE_PATH+"/"+plot.id.x+","+plot.id.y+","+world+","+owner+".schematic");
if (!result) { if (!result) {
PlayerFunctions.sendMessage(plr, "&7 - Failed to save &c"+plot.id); PlayerFunctions.sendMessage(plr, "&7 - Failed to save &c"+plot.id);
} }

22
PlotSquared/src/com/intellectualcrafters/plot/commands/Set.java
View File

@ -359,10 +359,24 @@ public class Set extends SubCommand {
PlotHelper.adjustWallFilling(plr, plot, new PlotBlock((short) material.getId(), data)); PlotHelper.adjustWallFilling(plr, plot, new PlotBlock((short) material.getId(), data));
return true; return true;
} }
StringBuilder builder = new StringBuilder(); {
builder.append(C.SUBCOMMAND_SET_OPTIONS_HEADER.s()); AbstractFlag af = new AbstractFlag("");
builder.append(getArgumentList(values)); try {
PlayerFunctions.sendMessage(plr, builder.toString()); af = new AbstractFlag(args[0].toLowerCase());
}
catch (Exception e) {
}
if (FlagManager.getFlags().contains(af)) {
StringBuilder a = new StringBuilder();
if(args.length > 1) {
for(int x = 1; x < args.length; x++)
a.append(" ").append(args[x]);
}
plr.performCommand("plot set flag " + args[0] + a.toString());
return true;
}
}
PlayerFunctions.sendMessage(plr, C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + getArgumentList(values));
return false; return false;
} }

1
PlotSquared/src/com/intellectualcrafters/plot/listeners/PlotListener.java
View File

@ -175,6 +175,7 @@ public class PlotListener {
} }
public static void plotExit(Player player, Plot plot) { public static void plotExit(Player player, Plot plot) {
player.setAllowFlight(false);
{ {
PlayerLeavePlotEvent callEvent = new PlayerLeavePlotEvent(player, plot); PlayerLeavePlotEvent callEvent = new PlayerLeavePlotEvent(player, plot);
Bukkit.getPluginManager().callEvent(callEvent); Bukkit.getPluginManager().callEvent(callEvent);

98
PlotSquared/src/com/intellectualsites/web/IndexHandler.java
View File

@ -1,98 +0,0 @@
package com.intellectualsites.web;
import java.io.PrintStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.bukkit.plugin.java.JavaPlugin;
import org.simpleframework.http.Request;
import org.simpleframework.http.Response;
import org.simpleframework.http.core.Container;
/**
* Created by Citymonstret on 2014-09-20.
*/
public class IndexHandler implements Container {
private JavaPlugin plugin;
private String title;
public IndexHandler(JavaPlugin plugin, String title) {
this.plugin = plugin;
this.title = title;
}
@Override
public void handle(Request request, Response response) {
try {
PrintStream body;
long time;
String coverage;
body = response.getPrintStream();
time = System.currentTimeMillis();
request.getQuery();
request.getPath();
if ((request.getInteger("page")) < 0) {
}
if (((coverage = request.getTarget()) == null) || coverage.equals("/")) {
coverage = "index";
}
coverage = coverage.toLowerCase();
List<String> list = new ArrayList<>(Arrays.asList(new String[] { "install", "index", "stylesheet" }));
if (!list.contains(coverage)) {
coverage = "index";
}
if (coverage.equals("stylesheet")) {
response.setValue("Content-Type", "text/css");
response.setValue("Server", "PlotWeb/1.0 (Simple 5.0)");
response.setDate("Date", time);
response.setDate("Last-Modified", time);
ResourceHandler stylesheet =
new ResourceHandler("stylesheet", ResourceHandler.FileType.CSS, this.plugin.getDataFolder());
String stylesheetHTML = stylesheet.getHTML();
stylesheet.done();
body.print(stylesheetHTML);
}
else {
response.setValue("Content-Type", "html");
response.setValue("Server", "PlotWeb/1.0 (Simple 5.0)");
response.setDate("Date", time);
response.setDate("Last-Modified", time);
ResourceHandler header =
new ResourceHandler("header", ResourceHandler.FileType.HTML, this.plugin.getDataFolder());
ResourceHandler footer =
new ResourceHandler("footer", ResourceHandler.FileType.HTML, this.plugin.getDataFolder());
ResourceHandler cPage =
new ResourceHandler(coverage, ResourceHandler.FileType.HTML, this.plugin.getDataFolder());
String headerHTML = header.getHTML().replace("@title", this.title);
String footerHTML = footer.getHTML();
String cPageHTML = cPage.getHTML();
header.done();
footer.done();
cPage.done();
body.print(headerHTML);
body.print(cPageHTML);
body.print(footerHTML);
}
body.close();
}
catch (Exception e) {
e.printStackTrace();
}
}
}

50
PlotSquared/src/com/intellectualsites/web/PlotWeb.java
View File

@ -1,50 +0,0 @@
package com.intellectualsites.web;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import org.bukkit.plugin.java.JavaPlugin;
import org.simpleframework.http.core.Container;
import org.simpleframework.http.core.ContainerServer;
import org.simpleframework.transport.Server;
import org.simpleframework.transport.connect.Connection;
import org.simpleframework.transport.connect.SocketConnection;
import com.intellectualcrafters.plot.PlotMain;
/**
* Created by Citymonstret on 2014-09-20.
*/
public class PlotWeb {
// TODO instructions on how to setup and use PlotWeb.
public static PlotWeb PLOTWEB;
private String title;
private int port;
private Server server;
private Connection connection;
private Container container;
private SocketAddress address;
public PlotWeb(String title, int port) {
this.title = title;
this.port = port;
}
public void start() throws Exception {
this.container = new IndexHandler(JavaPlugin.getPlugin(PlotMain.class), this.title);
this.server = new ContainerServer(this.container);
this.connection = new SocketConnection(this.server);
this.address = new InetSocketAddress(this.port);
this.connection.connect(this.address);
PLOTWEB = this;
}
public void stop() throws Exception {
this.connection.close();
PLOTWEB = null;
}
}

59
PlotSquared/src/com/intellectualsites/web/ResourceHandler.java
View File

@ -1,59 +0,0 @@
package com.intellectualsites.web;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
/**
* Created by Citymonstret on 2014-09-20.
*/
public class ResourceHandler {
private File file;
private BufferedReader reader;
public ResourceHandler(String filePath, FileType fileType, File folder) throws Exception {
if (fileType == FileType.CSS) {
this.file =
new File(folder.toPath().toString() + File.separator + "web" + File.separator + "css"
+ File.separator + filePath + "." + fileType.toString());
}
else {
this.file =
new File(folder.toPath().toString() + File.separator + "web" + File.separator + filePath + "."
+ fileType.toString());
}
}
public String getHTML() throws Exception {
StringBuilder html = new StringBuilder();
this.reader = new BufferedReader(new InputStreamReader(new FileInputStream(this.file)));
String line = "";
while ((line = this.reader.readLine()) != null) {
html.append(line);
}
return html.toString();
}
public void done() throws Exception {
this.reader.close();
}
public static enum FileType {
CSS("css"),
HTML("html"),
JS("js");
private String ext;
FileType(String ext) {
this.ext = ext;
}
@Override
public String toString() {
return this.ext;
}
}
}

17
PlotSquared/src/com/intellectualsites/web/Test.java
View File

@ -1,17 +0,0 @@
package com.intellectualsites.web;
/**
* Created by Citymonstret on 2014-09-20.
*/
public class Test {
public static void main(String[] args) {
try {
new PlotWeb("Test", 9000).start();
}
catch (Exception e) {
e.printStackTrace();
}
}
}