Commit Graph

2721 Commits

Author SHA1 Message Date
Sauilitired
a80c044b3e Merge remote-tracking branch 'origin/master'
Conflicts:
	PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java
2014-10-21 18:59:24 +02:00
Sauilitired
7bd6ee5f33 * Added Fly Flag
* Moved stuff away from the actual listener class
* Ability to delete plot on player ban
2014-10-21 18:53:52 +02:00
boy0001
c55faaec8d Fixes 2014-10-21 20:58:52 +11:00
boy0001
3bbd0a2293 Flags and plot users 2014-10-21 18:11:10 +11:00
Sauilitired
bc4c99bf3a Merge remote-tracking branch 'origin/master' 2014-10-21 08:18:37 +02:00
Sauilitired
bf7c36a637 Will now clear stuff :3 2014-10-21 08:18:30 +02:00
boy0001
9ad7a6d6ab fixed sign id 2014-10-21 16:51:50 +11:00
Sauilitired
5759e3e761 Fixed set command -> not allowing unclaimed plots 2014-10-21 07:44:17 +02:00
boy0001
9427bc7773 Changed version number 2014-10-21 16:36:47 +11:00
Sauilitired
264baf10e3 Fixed plot deletion 2014-10-21 07:35:15 +02:00
boy0001
66d596b993 fixes 2014-10-21 15:31:27 +11:00
boy0001
42a3ec0561 ... 2014-10-20 22:58:40 +11:00
boy0001
5e27ff52b8 Finished new PlotMeConverter 2014-10-20 21:42:50 +11:00
boy0001
c57e518143 New PlotMe converter... untested 2014-10-20 20:50:54 +11:00
boy0001
794ef7a01e fixes for plot clearing 2014-10-20 19:45:41 +11:00
Jesse Boyd
27c011f488 Working on PlotMeConverter
Re-organized some debug messages to display messages in a better format.
2014-10-20 19:04:59 -07:00
boy0001
92178ee696 This should be a debug setting. 2014-10-19 22:45:14 +11:00
boy0001
a79a3adcba fixed some really weird bugs...
like WTF, how does checking event.getTo() cause the player spawns to
change!?
2014-10-19 22:12:23 +11:00
boy0001
3796f41be3 Added flag value checks 2014-10-19 21:27:27 +11:00
Sauilitired
e767834144 Sort of forgot to actually change the players time... 2014-10-19 11:17:40 +02:00
Sauilitired
a18ac3ad05 Simple bug fixes + exception printing (debug for now) 2014-10-19 11:14:50 +02:00
Sauilitired
8b18c46926 Fix :3 2014-10-19 11:03:06 +02:00
Sauilitired
a57e8f938a Fixed caption 2014-10-19 10:47:59 +02:00
Sauilitired
fde2e84d1a Merge remote-tracking branch 'origin/master' 2014-10-19 10:46:12 +02:00
Sauilitired
e8d657eb5d Some fixes :p 2014-10-19 10:45:41 +02:00
boy0001
c0383851a8 Added plot purge for plot ID 2014-10-19 19:26:42 +11:00
Sauilitired
83ca1a55f0 Well, I knew it... 2014-10-19 10:22:50 +02:00
Sauilitired
bb43365538 Merge remote-tracking branch 'origin/master' 2014-10-19 10:19:47 +02:00
Sauilitired
8f411a3ce4 I'm sure I broke something :_: 2014-10-19 10:19:38 +02:00
boy0001
c8c4f1d848 made changes to plot clear/signs being removed 2014-10-19 18:29:39 +11:00
boy0001
b4f987e470 fixed concurrentModificationException 2014-10-19 17:37:17 +11:00
boy0001
7ce30ee955 more fixes 2014-10-19 17:19:01 +11:00
boy0001
093b38c4c3 fixes 2014-10-19 17:15:13 +11:00
boy0001
c8fe54e685 changed version number 2014-10-19 14:13:33 +11:00
Sauilitired
7f57b22e56 Gamemode :D 2014-10-18 14:10:57 +02:00
Sauilitired
dae0b00e35 Merge remote-tracking branch 'origin/master' 2014-10-18 13:55:11 +02:00
Sauilitired
15252ea94b Gamemode 2014-10-18 13:44:51 +02:00
boy0001
2edec161a8 my bad 2014-10-18 21:28:15 +11:00
Sauilitired
e4cd1bdc56 Flags :D 2014-10-18 12:12:32 +02:00
Sauilitired
7e62094152 Flags :D 2014-10-18 10:57:45 +02:00
Sauilitired
5d73a2fd6a Merge remote-tracking branch 'origin/master' 2014-10-18 10:24:59 +02:00
Sauilitired
86a4dbded8 Some global settings :D 2014-10-18 10:24:48 +02:00
boy0001
b23d4f26e6 actually fixed purge 2014-10-18 18:45:07 +11:00
boy0001
441d4dde2e fixed purge command 2014-10-18 15:54:16 +11:00
boy0001
04e8c5a8c4 added startMerge to plotManager 2014-10-18 15:49:08 +11:00
boy0001
fc9a31cbf4 fixed NPE from teleport event 2014-10-18 13:36:30 +11:00
boy0001
cb8822cd6a bug fixes. 2014-10-18 13:24:47 +11:00
Jesse Boyd
9ba5e3f91b It's probably better to put it here actually. 2014-10-18 11:37:30 -07:00
Jesse Boyd
6c614d1eec Fixed duplicate users potentially being added 2014-10-18 11:33:48 -07:00
Jesse Boyd
96fb8cfab9 Reload now reloads a bit more. 2014-10-18 11:30:25 -07:00