mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2024-06-24 10:05:04 +02:00
Improved flag system.
This commit is contained in:
Sauilitired
parent
be278ad781
commit
7343686a4e
|
|
@ -13,18 +13,7 @@
|
|||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="f6aaf715-4424-4f9e-96dc-b47edea10520" name="Default" comment="">
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/AbstractFlag.java" />
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/FlagManager.java" />
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/FlatFileManager.java" />
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Metrics.java" />
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/SQLite.java" />
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/sqldialects.xml" />
|
||||
<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/PlotMain.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Settings.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Settings.java" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/WorldGenerator.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/WorldGenerator.java" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/XPopulator.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/XPopulator.java" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/api/PlotAPI.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/api/PlotAPI.java" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
||||
</list>
|
||||
<ignored path="plot_news.iws" />
|
||||
|
|
@ -88,6 +77,16 @@
|
|||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="PlotAPI.java" pinned="false" current="true" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/api/PlotAPI.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.33224756" vertical-offset="1819" max-vertical-offset="4097">
|
||||
<caret line="156" column="19" selection-start-line="156" selection-start-column="19" selection-end-line="156" selection-end-column="19" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<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">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
|
|
@ -108,10 +107,10 @@
|
|||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="DBFunc.java" pinned="false" current="true" current-in-tab="true">
|
||||
<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="9.985025" vertical-offset="0" max-vertical-offset="11339">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="11339">
|
||||
<caret line="362" column="86" selection-start-line="362" selection-start-column="86" selection-end-line="362" selection-end-column="86" />
|
||||
<folding>
|
||||
<element signature="e#0#27100#0" expanded="true" />
|
||||
|
|
@ -175,16 +174,6 @@
|
|||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="XPopulator.java" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/XPopulator.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="720" max-vertical-offset="4964">
|
||||
<caret line="81" column="29" selection-start-line="81" selection-start-column="29" selection-end-line="81" selection-end-column="29" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
</leaf>
|
||||
</component>
|
||||
<component name="FindManager">
|
||||
|
|
@ -221,6 +210,7 @@
|
|||
<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/database/DBFunc.java" />
|
||||
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/api/PlotAPI.java" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
|
|
@ -486,12 +476,12 @@
|
|||
<property name="Repository.Attach.Sources" value="false" />
|
||||
<property name="LayoutCode.rearrangeEntriesJava" value="false" />
|
||||
<property name="FullScreen" value="false" />
|
||||
<property name="GenerateAntBuildDialog.generateSingleFile" value="false" />
|
||||
<property name="GenerateAntBuildDialog.generateSingleFile" value="true" />
|
||||
<property name="GenerateAntBuildDialog.enableUiFormCompile" value="true" />
|
||||
<property name="GenerateAntBuildDialog.forceTargetJdk" value="true" />
|
||||
<property name="GenerateAntBuildDialog.backupFiles" value="true" />
|
||||
<property name="GenerateAntBuildDialog.inclineRuntiemClasspath" value="false" />
|
||||
<property name="GenerateAntBuildDialog.generateIdeaHomeProperty" value="false" />
|
||||
<property name="GenerateAntBuildDialog.inclineRuntiemClasspath" value="true" />
|
||||
<property name="GenerateAntBuildDialog.generateIdeaHomeProperty" value="true" />
|
||||
<property name="GenerateAntBuildDialog.outputFileNameProperty" value="plotsquared" />
|
||||
<property name="options.lastSelected" value="SQL Dialects" />
|
||||
<property name="options.splitter.main.proportions" value="0.3" />
|
||||
|
|
@ -769,7 +759,7 @@
|
|||
<workItem from="1411412344326" duration="2559000" />
|
||||
<workItem from="1411428266938" duration="702000" />
|
||||
<workItem from="1411458289707" duration="5043000" />
|
||||
<workItem from="1411478912746" duration="8214000" />
|
||||
<workItem from="1411478912746" duration="8911000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="First Commit">
|
||||
<created>1411382351159</created>
|
||||
|
|
@ -831,11 +821,15 @@
|
|||
<created>1411469097893</created>
|
||||
<updated>1411469097893</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="16" />
|
||||
<task id="LOCAL-00016" summary="Improved flag system.">
|
||||
<created>1411491737240</created>
|
||||
<updated>1411491737240</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="17" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="30779000" />
|
||||
<option name="totallyTimeSpent" value="31476000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="-6" y="-6" width="1932" height="1062" extended-state="6" />
|
||||
|
|
@ -896,7 +890,8 @@
|
|||
<MESSAGE value="Small fixes" />
|
||||
<MESSAGE value="I like pretty configs." />
|
||||
<MESSAGE value="Attempt to fix db, might not always work. We got to add a warning to spigot." />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Attempt to fix db, might not always work. We got to add a warning to spigot." />
|
||||
<MESSAGE value="Improved flag system." />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Improved flag system." />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
|
|
@ -1100,18 +1095,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/api/PlotAPI.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="221" max-vertical-offset="4590">
|
||||
<caret line="32" column="32" selection-start-line="32" selection-start-column="32" selection-end-line="32" selection-end-column="32" />
|
||||
<folding>
|
||||
<marker date="1411466293698" expanded="true" signature="-1:-1" placeholder="/**...*/" />
|
||||
<marker date="1411466293698" expanded="true" signature="-1:-1" placeholder="/**...*/" />
|
||||
<marker date="1411466293698" expanded="true" signature="-1:-1" placeholder="/**...*/" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/FlatFileManager.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="221">
|
||||
|
|
@ -1349,7 +1332,7 @@
|
|||
</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="9.985025" vertical-offset="0" max-vertical-offset="11339">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="11339">
|
||||
<caret line="362" column="86" selection-start-line="362" selection-start-column="86" selection-end-line="362" selection-end-column="86" />
|
||||
<folding>
|
||||
<element signature="e#0#27100#0" expanded="true" />
|
||||
|
|
@ -1392,6 +1375,14 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/api/PlotAPI.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.33224756" vertical-offset="1819" max-vertical-offset="4097">
|
||||
<caret line="156" column="19" selection-start-line="156" selection-start-column="19" selection-end-line="156" selection-end-column="19" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</component>
|
||||
<component name="masterDetails">
|
||||
<states>
|
||||
|
|
|
|||
|
|
@ -96,7 +96,9 @@ public class PlotAPI {
|
|||
}
|
||||
/**
|
||||
* Get a plot based on the ID
|
||||
* @param id
|
||||
* @param world
|
||||
* @param x
|
||||
* @param z
|
||||
* @return plot, null if ID is wrong
|
||||
*/
|
||||
public Plot getPlot(World world, int x, int z) {
|
||||
|
|
@ -152,7 +154,7 @@ public class PlotAPI {
|
|||
}
|
||||
/**
|
||||
* Get all plots for the world
|
||||
* @param World to get plots of
|
||||
* @param world to get plots of
|
||||
* @return Plot[] - array of plot objects in world
|
||||
*/
|
||||
public Plot[] getPlots(World world) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user