Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-06-22 09:45:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

I'm sure I broke something :_:

Browse Source
This commit is contained in:
Sauilitired 2014-10-19 10:19:38 +02:00
parent 7f57b22e56
commit 8f411a3ce4
10 changed files with 367 additions and 342 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

427
.idea/workspace.xml
View File

@ -10,7 +10,15 @@
</component>
<component name="ChangeListManager">
<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/FlagManager.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/FlagManager.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Info.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Info.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java" />
<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/Plot.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Plot.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/PlotSettings.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotSettings.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Set.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Set.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="plot_news.iws" />
@ -37,10 +45,10 @@
<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="19934" max-vertical-offset="20655">
<caret line="1256" column="55" selection-start-line="1256" selection-start-column="55" selection-end-line="1256" selection-end-column="55" />
<state vertical-scroll-proportion="0.0" vertical-offset="19934" max-vertical-offset="20689">
<caret line="1255" column="18" selection-start-line="1255" selection-start-column="18" selection-end-line="1255" selection-end-column="18" />
<folding>
<element signature="e#0#37010#0" expanded="true" />
<element signature="e#0#37053#0" expanded="true" />
<element signature="e#3711#3804#0" expanded="true" />
<element signature="e#3799#3800#0" expanded="true" />
<element signature="e#5178#5179#0" expanded="true" />
@ -56,32 +64,25 @@
</provider>
</entry>
</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="1236" max-vertical-offset="4318">
<caret line="106" column="36" selection-start-line="106" selection-start-column="36" selection-end-line="106" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="FlagManager.java" pinned="false" current="false" current-in-tab="false">
<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="290" max-vertical-offset="1870">
<caret line="27" column="31" selection-start-line="27" selection-start-column="31" selection-end-line="27" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AbstractFlag.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/AbstractFlag.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="250" max-vertical-offset="918">
<caret line="28" column="7" selection-start-line="28" selection-start-column="7" selection-end-line="28" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="plugin.yml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/plugin.yml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="442">
<caret line="20" column="18" selection-start-line="20" selection-start-column="18" selection-end-line="20" selection-end-column="18" />
<folding />
<state vertical-scroll-proportion="0.0" vertical-offset="290" max-vertical-offset="2244">
<caret line="47" column="25" selection-start-line="47" selection-start-column="25" selection-end-line="47" selection-end-column="25" />
<folding>
<element signature="e#1372#1373#0" expanded="true" />
<element signature="e#1391#1392#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
@ -89,38 +90,18 @@
<file leaf-file-name="PlotSettings.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotSettings.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2822">
<caret line="52" column="7" selection-start-line="52" selection-start-column="7" selection-end-line="52" selection-end-column="7" />
<state vertical-scroll-proportion="0.0" vertical-offset="1629" max-vertical-offset="2244">
<caret line="101" column="0" selection-start-line="101" selection-start-column="0" selection-end-line="101" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Configuration.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Configuration.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1600" max-vertical-offset="3400">
<caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
<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="769" max-vertical-offset="1598">
<caret line="66" column="5" selection-start-line="66" selection-start-column="5" selection-end-line="66" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PlayerEvents.java" pinned="false" current="true" current-in-tab="true">
<file leaf-file-name="PlayerEvents.java" pinned="false" current="false" current-in-tab="false">
<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.25365853" vertical-offset="1986" max-vertical-offset="14858">
<caret line="142" column="29" selection-start-line="142" selection-start-column="29" selection-end-line="142" selection-end-column="29" />
<state vertical-scroll-proportion="-7.607143" vertical-offset="1895" max-vertical-offset="15266">
<caret line="140" column="33" selection-start-line="140" selection-start-column="33" selection-end-line="140" selection-end-column="33" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1751#1752#0" expanded="true" />
@ -130,32 +111,104 @@
</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">
<file leaf-file-name="PlotHelper.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2052" max-vertical-offset="2975">
<caret line="151" column="0" selection-start-line="151" selection-start-column="0" selection-end-line="151" selection-end-column="0" />
<state vertical-scroll-proportion="0.0" vertical-offset="12410" max-vertical-offset="15147">
<caret line="758" column="0" selection-start-line="758" selection-start-column="0" selection-end-line="758" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PlotUUIDSaver.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/uuid/PlotUUIDSaver.java">
<file leaf-file-name="PlayerFunctions.java" pinned="false" current="false" current-in-tab="false">
<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="0" max-vertical-offset="1173">
<caret line="14" column="45" selection-start-line="14" selection-start-column="45" selection-end-line="14" selection-end-column="45" />
<state vertical-scroll-proportion="0.0" vertical-offset="2243" max-vertical-offset="4250">
<caret line="157" column="0" selection-start-line="157" selection-start-column="0" selection-end-line="157" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Info.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Info.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1291" max-vertical-offset="2516">
<caret line="106" column="49" selection-start-line="106" selection-start-column="49" selection-end-line="106" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="DBFunc.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="14851" max-vertical-offset="15453">
<caret line="228" column="27" selection-start-line="228" selection-start-column="27" selection-end-line="228" selection-end-column="27" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2031#2032#0" expanded="true" />
<element signature="e#2058#2059#0" expanded="true" />
<element signature="e#2095#2096#0" expanded="true" />
<element signature="e#2122#2123#0" expanded="true" />
<marker date="1413706684777" expanded="true" signature="1542:1613" placeholder="UPDATE `plot..." />
<marker date="1413706684777" expanded="true" signature="2285:2343" placeholder="SELECT `id`,..plot..." />
<marker date="1413706684777" expanded="true" signature="5580:5661" placeholder="INSERT INTO ..." />
<marker date="1413706684777" expanded="true" signature="6256:6632" placeholder="CREATE TABLE..plot..." />
<marker date="1413706684777" expanded="true" signature="6654:6816" placeholder="CREATE TABLE..plot_denied..." />
<marker date="1413706684777" expanded="true" signature="6838:7001" placeholder="CREATE TABLE..plot_helpers..." />
<marker date="1413706684777" expanded="true" signature="7023:7186" placeholder="CREATE TABLE..plot_trusted..." />
<marker date="1413706684777" expanded="true" signature="7208:7814" placeholder="CREATE TABLE..plot_settings..." />
<marker date="1413706684777" expanded="true" signature="7836:8033" placeholder="CREATE TABLE..plot_ratings..." />
<marker date="1413706684777" expanded="true" signature="8081:8203" placeholder="ALTER TABLE `plot_settings`..." />
<marker date="1413706684777" expanded="true" signature="8259:8551" placeholder="CREATE TABLE..plot..." />
<marker date="1413706684777" expanded="true" signature="8573:8700" placeholder="CREATE TABLE..plot_denied..." />
<marker date="1413706684777" expanded="true" signature="8722:8850" placeholder="CREATE TABLE..plot_helpers..." />
<marker date="1413706684777" expanded="true" signature="8872:9000" placeholder="CREATE TABLE..plot_trusted..." />
<marker date="1413706684777" expanded="true" signature="9022:9545" placeholder="CREATE TABLE..plot_settings..." />
<marker date="1413706684777" expanded="true" signature="9567:9728" placeholder="CREATE TABLE..plot_ratings..." />
<marker date="1413706684777" expanded="true" signature="10146:10198" placeholder="DELETE FROM ..." />
<marker date="1413706684777" expanded="true" signature="10314:10365" placeholder="DELETE FROM ..." />
<marker date="1413706684777" expanded="true" signature="10481:10532" placeholder="DELETE FROM ..." />
<marker date="1413706684777" expanded="true" signature="10648:10681" placeholder="DELETE FROM ..." />
<marker date="1413706684777" expanded="true" signature="11199:11257" placeholder="INSERT INTO ..." />
<marker date="1413706684777" expanded="true" signature="11548:11652" placeholder="SELECT `id` ..plot..." />
<marker date="1413706684777" expanded="true" signature="13080:13442" placeholder="UPDATE `plot..." />
<marker date="1413706684777" expanded="true" signature="13470:13488" placeholder="ALTER TABLE `plot`..." />
<marker date="1413706684777" expanded="true" signature="13830:13891" placeholder="ALTER TABLE `plot_settings`..." />
<marker date="1413706684777" expanded="true" signature="14391:14458" placeholder="SELECT `id`,..plot..." />
<marker date="1413706684777" expanded="true" signature="17415:17479" placeholder="UPDATE `plot..." />
<marker date="1413706684777" expanded="true" signature="18235:18298" placeholder="UPDATE `plot..." />
<marker date="1413706684777" expanded="true" signature="18913:18977" placeholder="UPDATE `plot..." />
<marker date="1413706684777" expanded="true" signature="19714:19755" placeholder="SELECT `id` ..plot..." />
<marker date="1413706684777" expanded="true" signature="20419:20469" placeholder="DELETE FROM ..." />
<marker date="1413706684777" expanded="true" signature="20591:20640" placeholder="DELETE FROM ..." />
<marker date="1413706684777" expanded="true" signature="20762:20813" placeholder="DELETE FROM ..." />
<marker date="1413706684777" expanded="true" signature="20995:21045" placeholder="DELETE FROM ..." />
<marker date="1413706684777" expanded="true" signature="21197:21233" placeholder="DELETE FROM ..." />
<marker date="1413706684777" expanded="true" signature="21961:22028" placeholder="UPDATE `plot..." />
<marker date="1413706684777" expanded="true" signature="22557:22611" placeholder="SELECT * FRO..plot_settings..." />
<marker date="1413706684777" expanded="true" signature="23827:23889" placeholder="SELECT `user..plot_denied..." />
<marker date="1413706684777" expanded="true" signature="24463:24525" placeholder="SELECT `user..plot_helpers..." />
<marker date="1413706684777" expanded="true" signature="25048:25110" placeholder="SELECT `user..plot_trusted..." />
<marker date="1413706684777" expanded="true" signature="25683:25754" placeholder="DELETE FROM ..." />
<marker date="1413706684777" expanded="true" signature="26378:26449" placeholder="DELETE FROM ..." />
<marker date="1413706684777" expanded="true" signature="27075:27143" placeholder="INSERT INTO ..." />
<marker date="1413706684777" expanded="true" signature="27761:27829" placeholder="INSERT INTO ..." />
<marker date="1413706684777" expanded="true" signature="28455:28525" placeholder="DELETE FROM ..." />
<marker date="1413706684777" expanded="true" signature="29145:29212" placeholder="INSERT INTO ..." />
<marker date="1413706684777" expanded="true" signature="29671:29748" placeholder="SELECT AVG(`..plot_ratings..." />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Set.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Set.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.42358804" vertical-offset="0" max-vertical-offset="6426">
<caret line="36" column="83" selection-start-line="36" selection-start-column="83" selection-end-line="36" selection-end-column="83" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindManager">
@ -169,28 +222,21 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
<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/XPopulator.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/SQLite.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Metrics.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Flag.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/FlagManager.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/WorldGenerator.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/api/PlotAPI.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Set.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Debug.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/PlotMeConverter.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/SubCommand.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Rate.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/ConfigurationNode.java" />
<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/Merge.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Denied.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Helpers.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Info.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/list.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/SetOwner.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Trusted.java" />
@ -218,8 +264,15 @@
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Settings.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotWorld.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/AbstractFlag.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/FlagManager.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotSettings.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlayerFunctions.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Info.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Plot.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Set.java" />
</list>
</option>
</component>
@ -363,7 +416,37 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="listeners" />
<option name="myItemId" value="database" />
<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>
<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="commands" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@ -764,7 +847,7 @@
<workItem from="1413065609242" duration="214000" />
<workItem from="1413065904473" duration="9265000" />
<workItem from="1413125251335" duration="4054000" />
<workItem from="1413221404445" duration="18630000" />
<workItem from="1413221404445" duration="21082000" />
</task>
<task id="LOCAL-00001" summary="First Commit">
<created>1411382351159</created>
@ -938,11 +1021,15 @@
<created>1413632691993</created>
<updated>1413632691993</updated>
</task>
<option name="localTasksCounter" value="44" />
<task id="LOCAL-00044" summary="Gamemode :D">
<created>1413634257996</created>
<updated>1413634257996</updated>
</task>
<option name="localTasksCounter" value="45" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="97201000" />
<option name="totallyTimeSpent" value="99653000" />
</component>
<component name="TodoView" selected-index="0">
<todo-panel id="selected-file">
@ -985,7 +1072,7 @@
<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="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.20497803" 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.2035139" 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="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" />
@ -1040,7 +1127,6 @@
<option name="myTodoPanelSettings">
<TodoPanelSettings />
</option>
<MESSAGE value="Well, I broke it, sorry :(" />
<MESSAGE value="Fixed some items on the to-do list." />
<MESSAGE value="Started working on rate system :D" />
<MESSAGE value="I seriously doubt this is working xD" />
@ -1065,7 +1151,8 @@
<MESSAGE value="Some global settings :D" />
<MESSAGE value="Flags :D" />
<MESSAGE value="Gamemode" />
<option name="LAST_COMMIT_MESSAGE" value="Gamemode" />
<MESSAGE value="Gamemode :D" />
<option name="LAST_COMMIT_MESSAGE" value="Gamemode :D" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@ -1077,34 +1164,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Helpers.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="80" max-vertical-offset="2091">
<caret line="121" column="53" selection-start-line="121" selection-start-column="53" selection-end-line="121" selection-end-column="53" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Info.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1485" max-vertical-offset="2108">
<caret line="128" column="41" selection-start-line="128" selection-start-column="41" selection-end-line="128" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/SetOwner.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="208" max-vertical-offset="799">
<caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Trusted.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1517" max-vertical-offset="2108">
<caret line="122" column="53" selection-start-line="122" selection-start-column="53" selection-end-line="122" selection-end-column="53" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Visit.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="446" max-vertical-offset="1037">
@ -1112,13 +1171,6 @@
</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="1104" max-vertical-offset="7208">
<caret line="75" column="11" selection-start-line="75" selection-start-column="11" selection-end-line="75" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Rate.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="866" max-vertical-offset="1343">
@ -1242,14 +1294,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="12114" max-vertical-offset="13923">
<caret line="758" column="29" selection-start-line="758" selection-start-column="29" selection-end-line="758" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Debug.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="510" max-vertical-offset="1887">
@ -1423,14 +1467,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotSettings.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2822">
<caret line="52" column="7" selection-start-line="52" selection-start-column="7" selection-end-line="52" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Configuration.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1600" max-vertical-offset="3400">
@ -1455,14 +1491,6 @@
</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="290" max-vertical-offset="1870">
<caret line="27" column="31" selection-start-line="27" selection-start-column="31" selection-end-line="27" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/AbstractFlag.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="250" max-vertical-offset="918">
@ -1471,12 +1499,23 @@
</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="290" max-vertical-offset="2244">
<caret line="47" column="25" selection-start-line="47" selection-start-column="25" selection-end-line="47" selection-end-column="25" />
<folding>
<element signature="e#1372#1373#0" expanded="true" />
<element signature="e#1391#1392#0" expanded="true" />
</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="19934" max-vertical-offset="20655">
<caret line="1256" column="55" selection-start-line="1256" selection-start-column="55" selection-end-line="1256" selection-end-column="55" />
<state vertical-scroll-proportion="0.0" vertical-offset="19934" max-vertical-offset="20689">
<caret line="1255" column="18" selection-start-line="1255" selection-start-column="18" selection-end-line="1255" selection-end-column="18" />
<folding>
<element signature="e#0#37010#0" expanded="true" />
<element signature="e#0#37053#0" expanded="true" />
<element signature="e#3711#3804#0" expanded="true" />
<element signature="e#3799#3800#0" expanded="true" />
<element signature="e#5178#5179#0" expanded="true" />
@ -1491,10 +1530,18 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotSettings.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1629" max-vertical-offset="2244">
<caret line="101" column="0" selection-start-line="101" selection-start-column="0" selection-end-line="101" selection-end-column="0" />
<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.25365853" vertical-offset="1986" max-vertical-offset="14858">
<caret line="142" column="29" selection-start-line="142" selection-start-column="29" selection-end-line="142" selection-end-column="29" />
<state vertical-scroll-proportion="-7.607143" vertical-offset="1895" max-vertical-offset="15266">
<caret line="140" column="33" selection-start-line="140" selection-start-column="33" selection-end-line="140" selection-end-column="33" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1751#1752#0" expanded="true" />
@ -1503,6 +1550,102 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="12410" max-vertical-offset="15147">
<caret line="758" column="0" selection-start-line="758" selection-start-column="0" selection-end-line="758" selection-end-column="0" />
<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="2243" max-vertical-offset="4250">
<caret line="157" column="0" selection-start-line="157" selection-start-column="0" selection-end-line="157" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Info.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1291" max-vertical-offset="2516">
<caret line="106" column="49" selection-start-line="106" selection-start-column="49" selection-end-line="106" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Plot.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1236" max-vertical-offset="4318">
<caret line="106" column="36" selection-start-line="106" selection-start-column="36" selection-end-line="106" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="14851" max-vertical-offset="15453">
<caret line="228" column="27" selection-start-line="228" selection-start-column="27" selection-end-line="228" selection-end-column="27" />
<folding>
<marker date="1413706684777" expanded="true" signature="1542:1613" placeholder="UPDATE `plot..." />
<marker date="1413706684777" expanded="true" signature="2285:2343" placeholder="SELECT `id`,..plot..." />
<marker date="1413706684777" expanded="true" signature="5580:5661" placeholder="INSERT INTO ..." />
<marker date="1413706684777" expanded="true" signature="6256:6632" placeholder="CREATE TABLE..plot..." />
<marker date="1413706684777" expanded="true" signature="6654:6816" placeholder="CREATE TABLE..plot_denied..." />
<marker date="1413706684777" expanded="true" signature="6838:7001" placeholder="CREATE TABLE..plot_helpers..." />
<marker date="1413706684777" expanded="true" signature="7023:7186" placeholder="CREATE TABLE..plot_trusted..." />
<marker date="1413706684777" expanded="true" signature="7208:7814" placeholder="CREATE TABLE..plot_settings..." />
<marker date="1413706684777" expanded="true" signature="7836:8033" placeholder="CREATE TABLE..plot_ratings..." />
<marker date="1413706684777" expanded="true" signature="8081:8203" placeholder="ALTER TABLE `plot_settings`..." />
<marker date="1413706684777" expanded="true" signature="8259:8551" placeholder="CREATE TABLE..plot..." />
<marker date="1413706684777" expanded="true" signature="8573:8700" placeholder="CREATE TABLE..plot_denied..." />
<marker date="1413706684777" expanded="true" signature="8722:8850" placeholder="CREATE TABLE..plot_helpers..." />
<marker date="1413706684777" expanded="true" signature="8872:9000" placeholder="CREATE TABLE..plot_trusted..." />
<marker date="1413706684777" expanded="true" signature="9022:9545" placeholder="CREATE TABLE..plot_settings..." />
<marker date="1413706684777" expanded="true" signature="9567:9728" placeholder="CREATE TABLE..plot_ratings..." />
<marker date="1413706684777" expanded="true" signature="10146:10198" placeholder="DELETE FROM ..." />
<marker date="1413706684777" expanded="true" signature="10314:10365" placeholder="DELETE FROM ..." />
<marker date="1413706684777" expanded="true" signature="10481:10532" placeholder="DELETE FROM ..." />
<marker date="1413706684777" expanded="true" signature="10648:10681" placeholder="DELETE FROM ..." />
<marker date="1413706684777" expanded="true" signature="11199:11257" placeholder="INSERT INTO ..." />
<marker date="1413706684777" expanded="true" signature="11548:11652" placeholder="SELECT `id` ..plot..." />
<marker date="1413706684777" expanded="true" signature="13080:13442" placeholder="UPDATE `plot..." />
<marker date="1413706684777" expanded="true" signature="13470:13488" placeholder="ALTER TABLE `plot`..." />
<marker date="1413706684777" expanded="true" signature="13830:13891" placeholder="ALTER TABLE `plot_settings`..." />
<marker date="1413706684777" expanded="true" signature="14391:14458" placeholder="SELECT `id`,..plot..." />
<marker date="1413706684777" expanded="true" signature="17415:17479" placeholder="UPDATE `plot..." />
<marker date="1413706684777" expanded="true" signature="18235:18298" placeholder="UPDATE `plot..." />
<marker date="1413706684777" expanded="true" signature="18913:18977" placeholder="UPDATE `plot..." />
<marker date="1413706684777" expanded="true" signature="19714:19755" placeholder="SELECT `id` ..plot..." />
<marker date="1413706684777" expanded="true" signature="20419:20469" placeholder="DELETE FROM ..." />
<marker date="1413706684777" expanded="true" signature="20591:20640" placeholder="DELETE FROM ..." />
<marker date="1413706684777" expanded="true" signature="20762:20813" placeholder="DELETE FROM ..." />
<marker date="1413706684777" expanded="true" signature="20995:21045" placeholder="DELETE FROM ..." />
<marker date="1413706684777" expanded="true" signature="21197:21233" placeholder="DELETE FROM ..." />
<marker date="1413706684777" expanded="true" signature="21961:22028" placeholder="UPDATE `plot..." />
<marker date="1413706684777" expanded="true" signature="22557:22611" placeholder="SELECT * FRO..plot_settings..." />
<marker date="1413706684777" expanded="true" signature="23827:23889" placeholder="SELECT `user..plot_denied..." />
<marker date="1413706684777" expanded="true" signature="24463:24525" placeholder="SELECT `user..plot_helpers..." />
<marker date="1413706684777" expanded="true" signature="25048:25110" placeholder="SELECT `user..plot_trusted..." />
<marker date="1413706684777" expanded="true" signature="25683:25754" placeholder="DELETE FROM ..." />
<marker date="1413706684777" expanded="true" signature="26378:26449" placeholder="DELETE FROM ..." />
<marker date="1413706684777" expanded="true" signature="27075:27143" placeholder="INSERT INTO ..." />
<marker date="1413706684777" expanded="true" signature="27761:27829" placeholder="INSERT INTO ..." />
<marker date="1413706684777" expanded="true" signature="28455:28525" placeholder="DELETE FROM ..." />
<marker date="1413706684777" expanded="true" signature="29145:29212" placeholder="INSERT INTO ..." />
<marker date="1413706684777" expanded="true" signature="29671:29748" placeholder="SELECT AVG(`..plot_ratings..." />
</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.42358804" vertical-offset="0" max-vertical-offset="6426">
<caret line="36" column="83" selection-start-line="36" selection-start-column="83" selection-end-line="36" selection-end-column="83" />
<folding />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>

20
PlotSquared/src/com/intellectualcrafters/plot/FlagManager.java
View File

@ -28,6 +28,26 @@ public class FlagManager {
return flags.add(flag);
}
public static Flag[] removeFlag(Flag[] flags, String r) {
Flag[] f = new Flag[flags.length - 1];
int index = 0;
for(Flag flag : flags) {
if(!flag.getKey().equals(r))
f[index++] = flag;
}
return f;
}
public static Flag[] removeFlag(Set<Flag> flags, String r) {
Flag[] flagArray = new Flag[flags.size() - 1];
int index = 0;
for(Flag flag : flags) {
if(!flag.getKey().equals(r))
flagArray[index++] = flag;
}
return flagArray;
}
/**
* Get a list of registered AbstractFlag objects
*

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

@ -9,21 +9,12 @@
package com.intellectualcrafters.plot;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
import org.bukkit.WeatherType;
import org.bukkit.World;
import org.bukkit.*;
import org.bukkit.block.Biome;
import org.bukkit.entity.Player;
import java.util.*;
/**
* Functions involving players, plots and locations.
*
@ -135,23 +126,7 @@ public class PlayerFunctions {
return manager.getPlotId(plotworld, loc);
}
/**
* Sets the weather for a player, given the current plot settings
* @param player
* @param plot
*/
public static void togglePlotWeather(Player player, Plot plot) {
player.setPlayerWeather(plot.settings.getRain() ? WeatherType.DOWNFALL : WeatherType.CLEAR);
}
/**
* Sets the time for a player, given the current plot settings
* @param player
* @param plot
*/
public static void togglePlotTime(Player player, Plot plot) {
player.setPlayerTime(plot.settings.getTime(), false);
}
/**
* Returns the plot a player is currently in.
@ -180,7 +155,7 @@ public class PlayerFunctions {
/**
* Updates a given plot with another instance
* @deprecated
* @param id
* @param plot
*/
@Deprecated

15
PlotSquared/src/com/intellectualcrafters/plot/Plot.java
View File

@ -8,15 +8,14 @@
package com.intellectualcrafters.plot;
import java.util.ArrayList;
import java.util.UUID;
import com.intellectualcrafters.plot.database.DBFunc;
import org.bukkit.Bukkit;
import org.bukkit.World;
import org.bukkit.block.Biome;
import org.bukkit.entity.Player;
import com.intellectualcrafters.plot.database.DBFunc;
import java.util.ArrayList;
import java.util.UUID;
/**
* The plot class
@ -85,9 +84,6 @@ public class Plot implements Cloneable {
this.helpers = helpers;
this.denied = denied;
this.trusted = new ArrayList<UUID>();
this.settings.setTime(8000l);
this.settings.setRain(false);
this.settings.setTimeChange(false);
this.settings.setAlias("");
this.settings.setPosition(PlotHomePosition.DEFAULT);
this.delete = false;
@ -108,7 +104,7 @@ public class Plot implements Cloneable {
* @param merged
*/
public Plot(PlotId id, UUID owner, Biome plotBiome, ArrayList<UUID> helpers, ArrayList<UUID> trusted,
ArrayList<UUID> denied, boolean changeTime, long time, boolean rain, String alias,
ArrayList<UUID> denied, String alias,
PlotHomePosition position, Flag[] flags, String world, boolean[] merged) {
this.id = id;
this.settings = new PlotSettings(this);
@ -118,9 +114,6 @@ public class Plot implements Cloneable {
this.trusted = trusted;
this.helpers = helpers;
this.denied = denied;
this.settings.setTime(time);
this.settings.setRain(rain);
this.settings.setTimeChange(changeTime);
this.settings.setAlias(alias);
this.settings.setPosition(position);
this.settings.setMerged(merged);

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

@ -1251,7 +1251,9 @@ public class PlotMain extends JavaPlugin {
FlagManager.addFlag(new AbstractFlag(str));
}
List<String> otherFlags = Arrays.asList(
"gamemode"
"gamemode",
"weather",
"time"
);
for(String str : otherFlags) {
FlagManager.addFlag(new AbstractFlag(str));

54
PlotSquared/src/com/intellectualcrafters/plot/PlotSettings.java
View File

@ -8,12 +8,12 @@
package com.intellectualcrafters.plot;
import org.bukkit.block.Biome;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import org.bukkit.block.Biome;
/**
* plot settings
*
@ -32,22 +32,12 @@ public class PlotSettings {
* plot biome
*/
private Biome biome;
/**
* plot rain
*/
private boolean rain;
/**
*
*/
private Set<Flag> flags;
/**
* plot time
*/
private Long time;
/**
* Change time?
*/
private boolean changeTime;
private PlotHomePosition position;
/**
@ -99,19 +89,6 @@ public class PlotSettings {
this.biome = b;
}
/**
* @param b
*/
public void setTimeChange(boolean b) {
this.changeTime = b;
}
/**
* @param l
*/
public void setTime(long l) {
this.time = l;
}
/**
* @return
@ -122,30 +99,7 @@ public class PlotSettings {
return this.biome;
}
/**
* @return
*/
public boolean getRain() {
return this.rain;
}
public void setRain(boolean b) {
this.rain = b;
}
/**
* @return
*/
public long getTime() {
return this.time;
}
/**
* @return
*/
public boolean getChangeTime() {
return this.changeTime;
}
/**
* @param alias

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

@ -8,9 +8,8 @@
package com.intellectualcrafters.plot.commands;
import java.util.ArrayList;
import java.util.UUID;
import com.intellectualcrafters.plot.*;
import com.intellectualcrafters.plot.database.DBFunc;
import org.apache.commons.lang.StringUtils;
import org.bukkit.Bukkit;
import org.bukkit.Location;
@ -18,15 +17,8 @@ import org.bukkit.World;
import org.bukkit.block.Biome;
import org.bukkit.entity.Player;
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.PlotWorld;
import com.intellectualcrafters.plot.UUIDHandler;
import com.intellectualcrafters.plot.database.DBFunc;
import java.util.ArrayList;
import java.util.UUID;
/**
* @author Citymonstret
@ -113,8 +105,6 @@ public class Info extends SubCommand {
info = info.replaceAll("%id%", plot.id.toString());
info = info.replaceAll("%biome%", getBiomeAt(plot).toString());
info = info.replaceAll("%owner%", owner);
info = info.replaceAll("%time%", plot.settings.getChangeTime() ? plot.settings.getTime() + "" : "default");
info = info.replaceAll("%weather%", plot.settings.getRain() ? "rain" : "default");
info = info.replaceAll("%helpers%", getPlayerList(plot.helpers));
info = info.replaceAll("%trusted%", getPlayerList(plot.trusted));
info = info.replaceAll("%denied%", getPlayerList(plot.denied));

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

@ -8,32 +8,20 @@
package com.intellectualcrafters.plot.commands;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import com.intellectualcrafters.plot.*;
import com.intellectualcrafters.plot.database.DBFunc;
import com.intellectualcrafters.plot.events.PlotFlagAddEvent;
import com.intellectualcrafters.plot.events.PlotFlagRemoveEvent;
import org.apache.commons.lang.StringUtils;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.WeatherType;
import org.bukkit.block.Biome;
import org.bukkit.entity.Player;
import com.intellectualcrafters.plot.AbstractFlag;
import com.intellectualcrafters.plot.C;
import com.intellectualcrafters.plot.Flag;
import com.intellectualcrafters.plot.FlagManager;
import com.intellectualcrafters.plot.PlayerFunctions;
import com.intellectualcrafters.plot.Plot;
import com.intellectualcrafters.plot.PlotBlock;
import com.intellectualcrafters.plot.PlotHelper;
import com.intellectualcrafters.plot.PlotHomePosition;
import com.intellectualcrafters.plot.PlotMain;
import com.intellectualcrafters.plot.PlotWorld;
import com.intellectualcrafters.plot.database.DBFunc;
import com.intellectualcrafters.plot.events.PlotFlagAddEvent;
import com.intellectualcrafters.plot.events.PlotFlagRemoveEvent;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
* @author Citymonstret
@ -44,9 +32,9 @@ public class Set extends SubCommand {
super(Command.SET, "Set a plot value", "set {arg} {value...}", CommandCategory.ACTIONS, true);
}
public static String[] values = new String[] { "biome", "wall", "wall_filling", "floor", "alias", "home", "rain",
public static String[] values = new String[] { "biome", "wall", "wall_filling", "floor", "alias", "home",
"flag" };
public static String[] aliases = new String[] { "b", "w", "wf", "f", "a", "h", "r", "fl" };
public static String[] aliases = new String[] { "b", "w", "wf", "f", "a", "h", "fl" };
@SuppressWarnings("deprecation")
@Override
@ -168,31 +156,7 @@ public class Set extends SubCommand {
return false;
}
}
if (args[0].equalsIgnoreCase("rain")) {
if (args.length < 2) {
PlayerFunctions.sendMessage(plr, C.NEED_ON_OFF);
return false;
}
String word = args[1];
if (!word.equalsIgnoreCase("on") && !word.equalsIgnoreCase("off")) {
PlayerFunctions.sendMessage(plr, C.NEED_ON_OFF);
return true;
}
boolean b = word.equalsIgnoreCase("on");
DBFunc.setWeather(plr.getWorld().getName(), plot, b);
PlayerFunctions.sendMessage(plr, C.SETTING_UPDATED);
for (Player p : Bukkit.getOnlinePlayers()) {
if (PlayerFunctions.getCurrentPlot(plr).id == plot.id) {
if (b) {
p.setPlayerWeather(WeatherType.DOWNFALL);
}
else {
p.resetPlayerWeather();
}
}
}
return true;
}
if (args[0].equalsIgnoreCase("home")) {
if (args.length < 2) {

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

@ -160,7 +160,7 @@ public class DBFunc {
/**
* Create a plot
*
* @param plot
* @param plots
*/
public static void createPlots(ArrayList<Plot> plots) {
if (plots.size() == 0) {
@ -449,22 +449,7 @@ public class DBFunc {
ArrayList<UUID> helpers = plotHelpers(id);
ArrayList<UUID> trusted = plotTrusted(id);
ArrayList<UUID> denied = plotDenied(id);
// boolean changeTime = ((Short) settings.get("custom_time") ==
// 0) ? false : true;
long time = 8000l;
// if(changeTime) {
// time = Long.parseLong(settings.get("time").toString());
// }
// boolean rain =
// Integer.parseInt(settings.get("rain").toString()) == 1 ? true
// : false;
boolean rain;
try {
rain = (int) settings.get("rain") == 1 ? true : false;
}
catch (Exception e) {
rain = false;
}
String alias = (String) settings.get("alias");
if ((alias == null) || alias.equalsIgnoreCase("NEW")) {
alias = "";
@ -489,7 +474,7 @@ public class DBFunc {
merged[3 - i] = (merged_int & (1 << i)) != 0;
}
p =
new Plot(plot_id, owner, plotBiome, helpers, trusted, denied, /* changeTime */false, time, rain, alias, position, flags, worldname, merged);
new Plot(plot_id, owner, plotBiome, helpers, trusted, denied, alias, position, flags, worldname, merged);
if (plots.containsKey(worldname)) {
plots.get(worldname).put((plot_id), p);
}
@ -514,31 +499,6 @@ public class DBFunc {
return plots;
}
/**
* @param plot
* @param rain
*/
public static void setWeather(final String world, final Plot plot, final boolean rain) {
plot.settings.setRain(rain);
runTask(new Runnable() {
@Override
public void run() {
try {
int weather = rain ? 1 : 0;
PreparedStatement stmt =
connection.prepareStatement("UPDATE `plot_settings` SET `rain` = ? WHERE `plot_plot_id` = ?");
stmt.setInt(1, weather);
stmt.setInt(2, getId(world, plot.id));
stmt.execute();
stmt.close();
}
catch (SQLException e) {
e.printStackTrace();
Logger.add(LogLevel.WARNING, "Could not set weather for plot " + plot.id);
}
}
});
}
public static void setMerged(final String world, final Plot plot, final boolean[] merged) {
plot.settings.setMerged(merged);

36
PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java
View File

@ -135,6 +135,16 @@ public class PlayerEvents implements Listener {
}
}
private WeatherType getWeatherType(String str) {
str = str.toLowerCase();
List<String> storm = Arrays.asList("storm", "rain", "on");
if(storm.contains(str)) {
return WeatherType.DOWNFALL;
} else {
return WeatherType.CLEAR;
}
}
private GameMode getGameMode(String str) {
str = str.toLowerCase();
List<String> creative = Arrays.asList("creative" , "cr", "1");
@ -151,10 +161,26 @@ public class PlayerEvents implements Listener {
}
}
private HashMap<String, GameMode> previousGamemode = new HashMap<>();
public void plotEntry(Player player, Plot plot) {
if (plot.hasOwner()) {
if(plot.settings.getFlag("gamemode") != null) {
if(previousGamemode.containsKey(player.getName())) {
previousGamemode.remove(player.getName());
}
previousGamemode.put(player.getName(), player.getGameMode());
player.setGameMode(getGameMode(plot.settings.getFlag("gamemode").getValue()));
}
if(plot.settings.getFlag("time") != null) {
try {
int time = Integer.parseInt(plot.settings.getFlag("time").getValue());
} catch(Exception e) {
plot.settings.setFlags(FlagManager.removeFlag(plot.settings.getFlags(), "time"));
}
}
if(plot.settings.getFlag("weather") != null) {
player.setPlayerWeather(getWeatherType(plot.settings.getFlag("weather").getValue()));
}
if (C.TITLE_ENTERED_PLOT.s().length() > 2) {
String sTitleMain = C.TITLE_ENTERED_PLOT.s().replaceFirst("%s", plot.getDisplayName());
@ -172,12 +198,6 @@ public class PlayerEvents implements Listener {
Bukkit.getPluginManager().callEvent(callEvent);
}
PlayerFunctions.sendMessage(player, plot.settings.getJoinMessage());
if (plot.settings.getRain()) {
PlayerFunctions.togglePlotWeather(player, plot);
}
if (plot.settings.getChangeTime()) {
PlayerFunctions.togglePlotTime(player, plot);
}
}
}
@ -186,6 +206,10 @@ public class PlayerEvents implements Listener {
PlayerLeavePlotEvent callEvent = new PlayerLeavePlotEvent(player, plot);
Bukkit.getPluginManager().callEvent(callEvent);
}
if(previousGamemode.containsKey(player.getName())) {
player.setGameMode(previousGamemode.get(player.getName()));
previousGamemode.remove(player.getName());
}
player.resetPlayerTime();
player.resetPlayerWeather();
PlayerFunctions.sendMessage(player, plot.settings.getLeaveMessage());