Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-12-26 17:18:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Could you implement this setting? xD

Browse Source
This commit is contained in:
Sauilitired 2014-09-22 20:22:30 +02:00
parent b60a8fd6f9
commit deed728f93
5 changed files with 202 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

295
.idea/workspace.xml
View File

@ -9,12 +9,11 @@
<bookmark url="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/ConsoleColors.java" line="37" mnemonic="2" /> <bookmark url="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/ConsoleColors.java" line="37" mnemonic="2" />
</component> </component>
<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="Could you implement this setting? xD">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/artifacts/plotsquared__.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Claim.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Claim.java" />
<change type="DELETED" beforePath="C:\Users\Citymonstret\Desktop\workspace\bukkit\plot_news\.idea\artifacts\plotsquared.xml" afterPath="" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlayerFunctions.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlayerFunctions.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/C.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/C.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/commands/Schematic.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Schematic.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotWorld.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotWorld.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/SchematicHandler.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/SchematicHandler.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" />
@ -48,33 +47,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Plot.java" pinned="false" current="false" current-in-tab="false">
<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" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PlotMain.java" pinned="false" current="false" current-in-tab="false">
<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="9384" max-vertical-offset="11798">
<caret line="452" column="15" selection-start-line="452" selection-start-column="15" selection-end-line="452" selection-end-column="15" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="SchematicHandler.java" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="SchematicHandler.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/SchematicHandler.java"> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/SchematicHandler.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="2601"> <state vertical-scroll-proportion="0.0" vertical-offset="1700" max-vertical-offset="2601">
<caret line="33" column="45" selection-start-line="33" selection-start-column="45" selection-end-line="33" selection-end-column="45" /> <caret line="125" column="32" selection-start-line="125" selection-start-column="32" selection-end-line="125" selection-end-column="32" />
<folding> <folding>
<element signature="e#4653#4654#0" expanded="true" /> <element signature="e#4653#4654#0" expanded="true" />
<element signature="e#4693#4694#0" expanded="true" /> <element signature="e#4693#4694#0" expanded="true" />
@ -83,31 +60,77 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Title.java" pinned="false" current="true" current-in-tab="true"> <file leaf-file-name="Title.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/Title.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.30456027" vertical-offset="0" max-vertical-offset="7089"> <state vertical-scroll-proportion="0.0" vertical-offset="0" 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 /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Schematic.java" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="PlayerFunctions.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Schematic.java"> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlayerFunctions.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="202" max-vertical-offset="1224"> <state vertical-scroll-proportion="0.0" vertical-offset="1870" max-vertical-offset="3740">
<caret line="58" column="69" selection-start-line="58" selection-start-column="69" selection-end-line="58" selection-end-column="69" /> <caret line="142" column="5" selection-start-line="142" selection-start-column="5" selection-end-line="142" selection-end-column="5" />
<folding>
<element signature="e#3260#3261#0" expanded="true" />
<element signature="e#3292#3293#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PlotMain.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-9.25" vertical-offset="10043" max-vertical-offset="11730">
<caret line="637" column="48" selection-start-line="637" selection-start-column="48" selection-end-line="637" selection-end-column="48" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#3528#3547#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PlotWorld.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotWorld.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-15.464286" vertical-offset="2321" max-vertical-offset="2907">
<caret line="164" column="11" selection-start-line="164" selection-start-column="11" selection-end-line="164" selection-end-column="11" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="C.java" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="Clear.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/C.java"> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Clear.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="4675"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="527">
<caret line="26" column="63" selection-start-line="26" selection-start-column="63" selection-end-line="26" selection-end-column="63" /> <caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Claim.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Claim.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.723127" vertical-offset="423" max-vertical-offset="1071">
<caret line="61" column="69" selection-start-line="61" selection-start-column="69" selection-end-line="61" selection-end-column="69" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="WorldGenerator.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/WorldGenerator.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="748" max-vertical-offset="6766">
<caret line="85" column="73" selection-start-line="85" selection-start-column="73" selection-end-line="85" selection-end-column="73" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -123,26 +146,6 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="plotsquared.xml" pinned="false" current="false" current-in-tab="false">
<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" />
<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="0" max-vertical-offset="1071">
<caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FindManager"> <component name="FindManager">
@ -160,12 +163,16 @@
<option value="$PROJECT_DIR$/src/plot_news1.iml" /> <option value="$PROJECT_DIR$/src/plot_news1.iml" />
<option value="$PROJECT_DIR$/src/com/intellectualcrafters/plot/database/PlotMeConverter.java" /> <option value="$PROJECT_DIR$/src/com/intellectualcrafters/plot/database/PlotMeConverter.java" />
<option value="$PROJECT_DIR$/src/com/intellectualcrafters/plot/PlotMain.java" /> <option value="$PROJECT_DIR$/src/com/intellectualcrafters/plot/PlotMain.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Plot.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/ConsoleColors.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/ConsoleColors.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java" />
<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/commands/Schematic.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Schematic.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/SchematicHandler.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/SchematicHandler.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Plot.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlayerFunctions.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/WorldGenerator.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotWorld.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Claim.java" />
</list> </list>
</option> </option>
</component> </component>
@ -487,7 +494,7 @@
<workItem from="1411382238709" duration="182000" /> <workItem from="1411382238709" duration="182000" />
<workItem from="1411382421959" duration="656000" /> <workItem from="1411382421959" duration="656000" />
<workItem from="1411383098267" duration="5030000" /> <workItem from="1411383098267" duration="5030000" />
<workItem from="1411389312646" duration="3440000" /> <workItem from="1411389312646" duration="6166000" />
</task> </task>
<task id="LOCAL-00001" summary="First Commit"> <task id="LOCAL-00001" summary="First Commit">
<created>1411382351159</created> <created>1411382351159</created>
@ -521,11 +528,15 @@
<created>1411389346708</created> <created>1411389346708</created>
<updated>1411389346708</updated> <updated>1411389346708</updated>
</task> </task>
<option name="localTasksCounter" value="9" /> <task id="LOCAL-00009" summary="Schematics Fixed">
<created>1411393484598</created>
<updated>1411393484598</updated>
</task>
<option name="localTasksCounter" value="10" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="9308000" /> <option name="totallyTimeSpent" value="12034000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-6" y="-6" width="1932" height="1062" extended-state="6" /> <frame x="-6" y="-6" width="1932" height="1062" extended-state="6" />
@ -579,7 +590,8 @@
<MESSAGE value="Yey!" /> <MESSAGE value="Yey!" />
<MESSAGE value="Removed web stuff (caused crash)" /> <MESSAGE value="Removed web stuff (caused crash)" />
<MESSAGE value="Console Colour Support" /> <MESSAGE value="Console Colour Support" />
<option name="LAST_COMMIT_MESSAGE" value="Console Colour Support" /> <MESSAGE value="Schematics Fixed" />
<option name="LAST_COMMIT_MESSAGE" value="Schematics Fixed" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager /> <breakpoint-manager />
@ -613,7 +625,20 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2941" max-vertical-offset="4182"> <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" /> <caret line="173" column="29" selection-start-line="173" selection-start-column="29" selection-end-line="173" selection-end-column="29" />
<folding /> <folding>
<element signature="e#2919#2920#0" expanded="true" />
<element signature="e#2951#2952#0" expanded="true" />
<element signature="e#3038#3039#0" expanded="true" />
<element signature="e#3078#3079#0" expanded="true" />
<element signature="e#3986#3987#0" expanded="true" />
<element signature="e#4019#4020#0" expanded="true" />
<element signature="e#4094#4095#0" expanded="true" />
<element signature="e#4124#4125#0" expanded="true" />
<element signature="e#4213#4214#0" expanded="true" />
<element signature="e#4263#4264#0" expanded="true" />
<element signature="e#5537#5538#0" expanded="true" />
<element signature="e#5580#5581#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -623,6 +648,7 @@
<caret line="442" column="0" selection-start-line="442" selection-start-column="0" selection-end-line="448" selection-end-column="0" /> <caret line="442" column="0" selection-start-line="442" selection-start-column="0" selection-end-line="448" selection-end-column="0" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#3528#3547#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -709,14 +735,6 @@
</state> </state>
</provider> </provider>
</entry> </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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/plotsquared.properties"> <entry file="file://$PROJECT_DIR$/plotsquared.properties">
<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="929"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="929">
@ -725,16 +743,6 @@
</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="9384" max-vertical-offset="11798">
<caret line="452" column="15" selection-start-line="452" selection-start-column="15" selection-end-line="452" selection-end-column="15" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/C.java"> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/C.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="4675"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4675">
@ -751,14 +759,6 @@
</state> </state>
</provider> </provider>
</entry> </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/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="0" max-vertical-offset="1071"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1071">
@ -767,14 +767,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<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="0" 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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Schematic.java"> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Schematic.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="202" max-vertical-offset="1224"> <state vertical-scroll-proportion="0.0" vertical-offset="202" max-vertical-offset="1224">
@ -783,10 +775,74 @@
</state> </state>
</provider> </provider>
</entry> </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.3327787" vertical-offset="4" max-vertical-offset="3927">
<caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
<folding>
<element signature="e#2919#2920#0" expanded="true" />
<element signature="e#2951#2952#0" expanded="true" />
<element signature="e#3038#3039#0" expanded="true" />
<element signature="e#3078#3079#0" expanded="true" />
<element signature="e#3986#3987#0" expanded="true" />
<element signature="e#4019#4020#0" expanded="true" />
<element signature="e#4094#4095#0" expanded="true" />
<element signature="e#4124#4125#0" expanded="true" />
<element signature="e#4213#4214#0" expanded="true" />
<element signature="e#4263#4264#0" expanded="true" />
<element signature="e#5537#5538#0" expanded="true" />
<element signature="e#5580#5581#0" expanded="true" />
</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/src/com/intellectualcrafters/plot/WorldGenerator.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="748" max-vertical-offset="6766">
<caret line="85" column="73" selection-start-line="85" selection-start-column="73" selection-end-line="85" selection-end-column="73" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlayerFunctions.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1870" max-vertical-offset="3740">
<caret line="142" column="5" selection-start-line="142" selection-start-column="5" selection-end-line="142" selection-end-column="5" />
<folding>
<element signature="e#3260#3261#0" expanded="true" />
<element signature="e#3292#3293#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Title.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" 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" />
<folding />
</state>
</provider>
</entry>
<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="0" 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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/SchematicHandler.java"> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/SchematicHandler.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="2601"> <state vertical-scroll-proportion="0.0" vertical-offset="1700" max-vertical-offset="2601">
<caret line="33" column="45" selection-start-line="33" selection-start-column="45" selection-end-line="33" selection-end-column="45" /> <caret line="125" column="32" selection-start-line="125" selection-start-column="32" selection-end-line="125" selection-end-column="32" />
<folding> <folding>
<element signature="e#4653#4654#0" expanded="true" /> <element signature="e#4653#4654#0" expanded="true" />
<element signature="e#4693#4694#0" expanded="true" /> <element signature="e#4693#4694#0" expanded="true" />
@ -794,10 +850,37 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Title.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.30456027" vertical-offset="0" max-vertical-offset="7089"> <state vertical-scroll-proportion="-9.25" vertical-offset="10043" max-vertical-offset="11730">
<caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" /> <caret line="637" column="48" selection-start-line="637" selection-start-column="48" selection-end-line="637" selection-end-column="48" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#3528#3547#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Clear.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="527">
<caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotWorld.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-15.464286" vertical-offset="2321" max-vertical-offset="2907">
<caret line="164" column="11" selection-start-line="164" selection-start-column="11" selection-end-line="164" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Claim.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.723127" vertical-offset="423" max-vertical-offset="1071">
<caret line="61" column="69" selection-start-line="61" selection-start-column="69" selection-end-line="61" selection-end-column="69" />
<folding /> <folding />
</state> </state>
</provider> </provider>

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

@ -129,8 +129,6 @@ public class PlayerFunctions {
return plots.get(id); return plots.get(id);
} }
} }
else {
}
return new Plot(id, null, Biome.FOREST, new ArrayList<UUID>(), new ArrayList<UUID>(), world.getName()); return new Plot(id, null, Biome.FOREST, new ArrayList<UUID>(), new ArrayList<UUID>(), world.getName());
} }

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

@ -574,10 +574,6 @@ public class PlotMain extends JavaPlugin {
Settings.DB.DATABASE = storage.getString("mysql_database"); Settings.DB.DATABASE = storage.getString("mysql_database");
} }
{ {
Settings.Update.AUTO_UPDATE = config.getBoolean("auto_update");
//Web //Web
Web.ENABLED = config.getBoolean("web.enabled"); Web.ENABLED = config.getBoolean("web.enabled");
Web.PORT = config.getInt("web.port"); Web.PORT = config.getInt("web.port");
@ -645,7 +641,7 @@ public class PlotMain extends JavaPlugin {
} }
else { else {
ChunkGenerator gen = world.getGenerator(); ChunkGenerator gen = world.getGenerator();
if (gen==null || gen.toString().equals("PlotSquared")) { if (gen==null || !gen.toString().equals("PlotSquared")) {
Logger.add(LogLevel.WARNING, "World '"+node+"' in settings.yml is not using PlotSquared generator"); Logger.add(LogLevel.WARNING, "World '"+node+"' in settings.yml is not using PlotSquared generator");
} }
} }

8
PlotSquared/src/com/intellectualcrafters/plot/PlotWorld.java
View File

@ -1,9 +1,9 @@
package com.intellectualcrafters.plot; package com.intellectualcrafters.plot;
import java.util.ArrayList;
import org.bukkit.Material; import org.bukkit.Material;
import java.util.ArrayList;
public class PlotWorld { public class PlotWorld {
/** /**
* Road Height * Road Height
@ -160,4 +160,8 @@ public class PlotWorld {
*/ */
public static ArrayList<Material> BLOCKS = new ArrayList<Material>(); public static ArrayList<Material> BLOCKS = new ArrayList<Material>();
public boolean SCHEMATIC_ON_CLAIM = false;
public String SCHEMATIC_FILE = "null";
} }

6
PlotSquared/src/com/intellectualcrafters/plot/commands/Claim.java
View File

@ -55,6 +55,12 @@ public class Claim extends SubCommand{
if(teleport) { if(teleport) {
PlotMain.teleportPlayer(player, player.getLocation(), plot); PlotMain.teleportPlayer(player, player.getLocation(), plot);
} }
PlotWorld world = PlotMain.getWorldSettings(plot.getWorld());
if(world.SCHEMATIC_ON_CLAIM) {
SchematicHandler handler = new SchematicHandler();
SchematicHandler.Schematic schematic = handler.getSchematic(world.SCHEMATIC_FILE);
handler.paste(player.getLocation(), schematic, plot);
}
} }
return event.isCancelled(); return event.isCancelled();
} }