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

Simple bug fixes + exception printing (debug for now)

Browse Source
This commit is contained in:
Sauilitired 2014-10-19 11:14:50 +02:00
parent 8b18c46926
commit a18ac3ad05
2 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
.idea/workspace.xml
View File

@ -9,8 +9,8 @@
</artifacts-to-build> </artifacts-to-build>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="f6aaf715-4424-4f9e-96dc-b47edea10520" name="Default" comment=""> <list default="true" id="f6aaf715-4424-4f9e-96dc-b47edea10520" name="Default" comment="Fix :3&#10;">
<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/listeners/PlayerEvents.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.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" />
@ -44,12 +44,13 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="PlayerEvents.java" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="PlayerEvents.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java"> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-18.5" vertical-offset="2049" max-vertical-offset="15300"> <state vertical-scroll-proportion="0.66721314" vertical-offset="1582" max-vertical-offset="15470">
<caret line="167" column="38" selection-start-line="167" selection-start-column="38" selection-end-line="167" selection-end-column="38" /> <caret line="127" column="23" selection-start-line="127" selection-start-column="23" selection-end-line="127" selection-end-column="23" />
<folding> <folding>
<element signature="e#0#26520#0" expanded="true" />
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#1804#1805#0" expanded="true" /> <element signature="e#1804#1805#0" expanded="true" />
<element signature="e#1859#1860#0" expanded="true" /> <element signature="e#1859#1860#0" expanded="true" />
@ -94,11 +95,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="C.java" pinned="false" current="true" current-in-tab="true"> <file leaf-file-name="C.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/C.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.7824" vertical-offset="5546" max-vertical-offset="6290"> <state vertical-scroll-proportion="0.0" vertical-offset="5597" max-vertical-offset="6290">
<caret line="363" column="43" selection-start-line="363" selection-start-column="43" selection-end-line="363" selection-end-column="43" /> <caret line="374" column="0" selection-start-line="374" selection-start-column="0" selection-end-line="374" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -253,9 +254,9 @@
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Set.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Set.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/PlotMeConverter.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/PlotMeConverter.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Info.java" /> <option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Info.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/listeners/PlayerEvents.java" />
</list> </list>
</option> </option>
</component> </component>
@ -830,7 +831,7 @@
<workItem from="1413065609242" duration="214000" /> <workItem from="1413065609242" duration="214000" />
<workItem from="1413065904473" duration="9265000" /> <workItem from="1413065904473" duration="9265000" />
<workItem from="1413125251335" duration="4054000" /> <workItem from="1413125251335" duration="4054000" />
<workItem from="1413221404445" duration="23714000" /> <workItem from="1413221404445" duration="24407000" />
</task> </task>
<task id="LOCAL-00001" summary="First Commit"> <task id="LOCAL-00001" summary="First Commit">
<created>1411382351159</created> <created>1411382351159</created>
@ -1024,11 +1025,15 @@
<created>1413708479859</created> <created>1413708479859</created>
<updated>1413708479859</updated> <updated>1413708479859</updated>
</task> </task>
<option name="localTasksCounter" value="49" /> <task id="LOCAL-00049" summary="Fix :3&#10;">
<created>1413709386703</created>
<updated>1413709386703</updated>
</task>
<option name="localTasksCounter" value="50" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="102285000" /> <option name="totallyTimeSpent" value="102978000" />
</component> </component>
<component name="TodoView" selected-index="0"> <component name="TodoView" selected-index="0">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
@ -1126,7 +1131,6 @@
<option name="myTodoPanelSettings"> <option name="myTodoPanelSettings">
<TodoPanelSettings /> <TodoPanelSettings />
</option> </option>
<MESSAGE value="Updated plugin info: New link, total downloads + newest version" />
<MESSAGE value="Improved economy (multiplies price * plots) :D&#10;Added you to plugin.yml" /> <MESSAGE value="Improved economy (multiplies price * plots) :D&#10;Added you to plugin.yml" />
<MESSAGE value="Yup." /> <MESSAGE value="Yup." />
<MESSAGE value="I hope this works..." /> <MESSAGE value="I hope this works..." />
@ -1151,7 +1155,8 @@
<MESSAGE value="Well, I knew it..." /> <MESSAGE value="Well, I knew it..." />
<MESSAGE value="Some fixes :p" /> <MESSAGE value="Some fixes :p" />
<MESSAGE value="Fixed caption" /> <MESSAGE value="Fixed caption" />
<option name="LAST_COMMIT_MESSAGE" value="Fixed caption" /> <MESSAGE value="Fix :3&#10;" />
<option name="LAST_COMMIT_MESSAGE" value="Fix :3&#10;" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
@ -1612,18 +1617,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-18.5" vertical-offset="2049" max-vertical-offset="15300">
<caret line="167" column="38" selection-start-line="167" selection-start-column="38" selection-end-line="167" selection-end-column="38" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1804#1805#0" expanded="true" />
<element signature="e#1859#1860#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Info.java"> <entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Info.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="199" max-vertical-offset="2516"> <state vertical-scroll-proportion="0.0" vertical-offset="199" max-vertical-offset="2516">
@ -1634,12 +1627,25 @@
</entry> </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.7824" vertical-offset="5546" max-vertical-offset="6290"> <state vertical-scroll-proportion="0.0" vertical-offset="5597" max-vertical-offset="6290">
<caret line="363" column="43" selection-start-line="363" selection-start-column="43" selection-end-line="363" selection-end-column="43" /> <caret line="374" column="0" selection-start-line="374" selection-start-column="0" selection-end-line="374" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.66721314" vertical-offset="1582" max-vertical-offset="15470">
<caret line="127" column="23" selection-start-line="127" selection-start-column="23" selection-end-line="127" selection-end-column="23" />
<folding>
<element signature="e#0#26520#0" expanded="true" />
<element signature="imports" expanded="true" />
<element signature="e#1804#1805#0" expanded="true" />
<element signature="e#1859#1860#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>

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

@ -118,6 +118,9 @@ public class PlayerEvents implements Listener {
event.getPlayer().saveData(); event.getPlayer().saveData();
} }
textures(event.getPlayer()); textures(event.getPlayer());
if(isInPlot(event.getPlayer().getLocation())) {
plotEntry(event.getPlayer(), getCurrentPlot(event.getPlayer().getLocation()));
}
} }
private void textures(Player p) { private void textures(Player p) {
@ -171,6 +174,7 @@ public class PlayerEvents implements Listener {
try { try {
int time = Integer.parseInt(plot.settings.getFlag("time").getValue()); int time = Integer.parseInt(plot.settings.getFlag("time").getValue());
} catch(Exception e) { } catch(Exception e) {
e.printStackTrace();
plot.settings.setFlags(FlagManager.removeFlag(plot.settings.getFlags(), "time")); plot.settings.setFlags(FlagManager.removeFlag(plot.settings.getFlags(), "time"));
} }
} }