Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-12-28 17:38:01 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,699 Commits 14 Branches 69 Tags 90 MiB
26e73af35c
Commit Graph

365 Commits

Author SHA1 Message Date
boy0001
bb32507841 Fix plot unclaiming for non hybrid classic generators. 2015-09-27 17:20:59 +10:00
boy0001
3336d302ac Potential fixes 2015-09-27 16:43:11 +10:00
boy0001
a93e8fac38 Some fixes 
Fixes #641
Closes #640 (need to also update Plot2Dynmap)
Fixes #637 (duplicate)
Fixes #636
Fixes #634
 2015-09-26 18:05:27 +10:00
boy0001
d42ef3cf63 restructure a couple things. 2015-09-22 23:23:28 +10:00
boy0001
c948b18239 Forward plot home to plot visit 2015-09-15 14:56:23 +10:00
boy0001
9682e2914c Recover from world gen error. 2015-09-15 00:35:28 +10:00
boy0001
b524d5fcfe minor conversion tweaks + fix plot sorting with empty worlds. 2015-09-15 00:24:25 +10:00
boy0001
4002ed4de1 Fixes #613 2015-09-14 20:43:51 +10:00
boy0001
064a555ba1 Fix cluster create with non ascending coords 2015-09-14 18:39:07 +10:00
boy0001
91bfcd0deb Fixes #620 2015-09-14 18:20:25 +10:00
boy0001
5137b23357 Hows this? 2015-09-13 14:04:31 +10:00
boy0001
1cccdd9d4d Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 
Conflicts:
	src/main/java/com/intellectualcrafters/plot/IPlotMain.java
	src/main/java/com/intellectualcrafters/plot/commands/Trim.java
	src/main/java/com/intellectualcrafters/plot/util/ChunkManager.java
	src/main/java/com/plotsquared/bukkit/BukkitMain.java
	src/main/java/com/plotsquared/bukkit/util/BukkitChunkManager.java
	src/main/java/com/plotsquared/sponge/SpongeMain.java
	src/main/java/com/plotsquared/sponge/util/SpongeChunkManager.java
 2015-09-13 13:46:45 +10:00
boy0001
c163446f7e Fix plot clear event not being called. 2015-09-13 13:33:18 +10:00
boy0001
052019bb35 default to offline-mode uuid if owner isn't valid. 2015-09-13 13:30:28 +10:00
boy0001
a6535d3b7b Forward plot set flag to the flag command. 2015-09-13 01:26:35 +10:00
boy0001
1c28a72f9c WE unregistration + home/visit sorting + format 
- WorldEdit listener unregistration for external masking/extent/async
worldedit management. (wink)
- Use the same listing for home and visit as previous behavior was
confusing.
 2015-09-13 01:19:39 +10:00
boy0001
c386f33df8 cleanup 2015-09-11 20:09:22 +10:00
Byteflux
629ff443f3 Fix trimming for worlds in non-standard directories 2015-09-09 22:34:41 -07:00
boy0001
37a8861fa0 Temporary fix for sponge toggles. 2015-09-07 22:31:48 +10:00
boy0001
66730794d6 Fixes for sponge + minor tweaks for spigot 
- Updated to sponge 591
- Added optional WorldEdit restriction
- several fixes (including greeting/farewell flag)
 2015-09-07 22:17:48 +10:00
boy0001
2b3b947143 Fix plot entry/leave for sponge. 2015-09-06 11:53:56 +10:00
boy0001
ea146dcf91 Fix plot chat, chatspy + add comment spying 2015-09-06 10:33:11 +10:00
boy0001
e704784570 Try this version, otherwise maybe downgrade? 2015-09-05 20:45:31 +10:00
boy0001
a71d5a134b Fix rating when no categories are configured 2015-09-05 20:17:39 +10:00
boy0001
e3cb59f362 Lazy UUID conversion 2015-09-05 20:07:59 +10:00
boy0001
8606319340 Fix world caching + block interaction 
Fixes #608
 2015-09-05 11:35:43 +10:00
boy0001
c707a7baa2 Remove spectator from flag pack 2015-09-03 23:34:52 +10:00
boy0001
4e321d2b27 Here you go. 2015-09-03 22:40:36 +10:00
boy0001
dfc32741fa Export negative coord blocks with BO3 if not part of normal plot component 2015-09-03 15:57:12 +10:00
boy0001
574ca7a180 Call plot leave on quit 2015-09-03 15:48:36 +10:00
boy0001
afef79ea66 Some changes 
Fixes #605
Possibly #604
Other minor tweaks
 2015-09-03 15:45:25 +10:00
boy0001
3a29022d19 Add command queue option + fix nearest target 2015-09-01 21:33:45 +10:00
boy0001
ea6d5778c8 Added chat spy toggle 2015-09-01 15:09:46 +10:00
boy0001
6006b0e011 Add world parameter to EconHandler permission checks 
Fixes #595
 2015-09-01 14:02:37 +10:00
boy0001
f22874970f Fix side location + fix brushtool mask 2015-09-01 10:23:46 +10:00
boy0001
6671fd7e6d Fixes #582 2015-09-01 09:55:14 +10:00
boy0001
29da0da8bb Fixes #577 2015-09-01 08:51:51 +10:00
boy0001
9accbd5ea7 Decrease intensity of fastmode clearing 2015-09-01 07:31:53 +10:00
Pieter Maes
a63110f303 Fixing plotme converter for some installations 
-Making sure the uuid is checked when it's ownerId
-Checking if there are uuid's for denied/allowed, then use them if those are not in the cache
 2015-08-30 16:23:05 +02:00
boy0001
4027e84a0a Fixed boat interaction 2015-08-30 16:24:53 +10:00
boy0001
0ba838b16b Minor tweaks 
- SBQ unsanitized input
- plotme conversion tweaks
- schematic default output directory
- increment version number
 2015-08-30 16:19:35 +10:00
boy0001
3662b05da8 Fixes #584 2015-08-29 18:47:56 +10:00
boy0001
fb0b50218d Ignore invalid tool 2015-08-29 12:25:13 +10:00
boy0001
75fbf67dca Fix async worldedit masks 2015-08-29 06:56:02 +10:00
boy0001
0dbb1887d5 Prevent teleporting to invalid coordinates 2015-08-28 16:36:26 +10:00
boy0001
1e8bdb17f8 Per player plot cluster limits 2015-08-28 16:28:55 +10:00
boy0001
22997ac089 Some work on plot clusters 2015-08-28 12:37:01 +10:00
boy0001
ad94637c2a Fix inbox deletion perm 2015-08-28 09:53:35 +10:00
boy0001
552ace359a Feedback for failed uploads + fix plot list done 2015-08-28 09:51:59 +10:00
boy0001
ac27a7f37a Fix automerge.js 2015-08-28 09:51:05 +10:00
boy0001
fcf2400798 Fix lighting updates for chunks not sent to players 2015-08-28 09:50:57 +10:00
boy0001
5acd9c5143 Download requires done 2015-08-28 09:50:44 +10:00
boy0001
56d50bd9e1 Fix masking extent + process non plot worlds 2015-08-28 08:33:32 +10:00
boy0001
5b44e39bec documentation + fix toggles for admins 2015-08-26 16:44:50 +10:00
boy0001
3229705012 Offline uuid from flat file. 2015-08-26 14:21:48 +10:00
boy0001
1872e147cb WE delayed command execution + fix SBQ notify 2015-08-26 12:02:00 +10:00
boy0001
dc37465c8a Forgot to push this 2015-08-26 08:35:32 +10:00
boy0001
b2f8238f5d fix undo 2015-08-25 12:23:10 +10:00
boy0001
2b187f2066 3.1.6 2015-08-25 10:51:33 +10:00
boy0001
6ca6880917 New features + fixes 
Fixed a very specific case of IC world not loading with multiverse every
second startup
Fixed chunks not being sent for plot clearing (although it was being
sent for other thing) Fixes #554
Added fast experimental sudo-async worldedit processor
 2015-08-25 09:01:45 +10:00
boy0001
0e8ae9e6e4 WE tweak / Fix teleport event 2015-08-25 05:56:22 +10:00
boy0001
3164838e05 Experimental allow plot clearing on mega plots 2015-08-25 03:07:09 +10:00
boy0001
c7f5e3061d Retain trusted / helpers / denied when merging 
fixes #533
 2015-08-25 02:52:02 +10:00
boy0001
8c245b4f21 Optional bo3 tags 2015-08-25 02:33:28 +10:00
boy0001
68df5b1930 Fixed interactive chat colors + added interactive pages to sponge. 2015-08-25 02:28:32 +10:00
boy0001
83d0b8cebb Revert some plot chat changes. 
- Having chat for that plotworld will force it on all players without
the bypass permission
- Not having it will require the player to opt into plot chat
 2015-08-25 00:35:37 +10:00
boy0001
3bc3b51a27 Fix plot automerging 2015-08-25 00:19:50 +10:00
boy0001
f2d56ec231 Plot merge limits 2015-08-25 00:00:29 +10:00
boy0001
66f73374ac Tweak block interaction flags 2015-08-24 04:31:33 +10:00
boy0001
d427ba3152 Fix auto-trim 2015-08-24 04:09:57 +10:00
boy0001
79b16b8040 ChunkProcessor auto trim and chunk unloading 
- The auto trim drastically reduces the cost of players exploring on
speed 10, as it prevents chunks of unowned plots from saving to disk
when the chunk is unloaded
- It is recommended to disable world auto saving, or also enable the
chunk processor GC, as otherwise minecraft will also save chunks as they
are loaded.
 2015-08-24 03:29:59 +10:00
boy0001
bd86caa818 Fixed fallback plotme conversion 2015-08-24 00:17:17 +10:00
boy0001
d52e9b4c8c Minor fixes 2015-08-23 22:04:52 +10:00
confuser
316a4e0484 Fixed plot chat using meta instead of attributes 
Pass message into setFormat and setMessage correctly
this avoids % symbols in player messages causing exceptions

Fixed #571
 2015-08-23 12:00:52 +01:00
confuser
b5fbc6629f Fixed compiliation issue 2015-08-23 11:36:41 +01:00
Lax
373044c928 cannot into spelling 2015-08-21 21:12:16 -07:00
boy0001
83b1be8944 revert this 2015-08-21 19:24:20 +10:00
boy0001
2185384746 . 2015-08-21 14:53:53 +10:00
boy0001
b063494955 Redstone, chunk sending, reload fix, chunk unloader, 
- Added redstone disabler when no players are in the plot
- Fixed chunk sending leaving ghost blocks
- Fixed reloading not populating new values
- Added chunk unloader to chunk processor (decreases memory usage)
 2015-08-21 04:54:42 +10:00
boy0001
5f8505e698 Fix permission checking 2015-08-20 21:51:26 +10:00
boy0001
75f189aae8 Fix auto updating. 2015-08-20 20:48:48 +10:00
boy0001
d0605b9b55 Fixes 
Fixes #556
Fixes #540
Fixed plot analysis being slow
Fixed auto updating
 2015-08-20 14:56:25 +10:00
boy0001
be94aa53d3 Option for building restriction on finished plots 2015-08-19 06:44:32 +10:00
boy0001
be6705241c Fix plot offset for regenallroads 2015-08-19 04:51:14 +10:00
boy0001
afbf07826a Allow direct import from a backup 2015-08-19 02:08:42 +10:00
boy0001
b059de5098 Several changes: 
- Several API improvements
- persistent WorldEdit bypass toggle
- persistent plot chat toggle
- Plot BO3 exporting (useful f
- Fix fastmode clearing unclaim border
- Add player-interact flag for NPC interaction etc. Fixes #543
- Several fixes for sponge
- some code cleanup
- Closes #529
 2015-08-18 23:20:11 +10:00
boy0001
fcfd6616be Splash potion protection 2015-08-15 13:37:11 +10:00
boy0001
ccbd2ab30f Sponge stuff + done flag 2015-08-14 08:52:31 +10:00
boy0001
393a85c1bc Done flag 2015-08-14 03:22:32 +10:00
boy0001
b7fe6ea749 Fix plot rating & mega plots + fix plot expiry analysis 2015-08-13 22:49:16 +10:00
boy0001
8040e13919 Don't use keyset on ConcurrentHashMap 2015-08-13 22:39:29 +10:00
boy0001
160ac794e1 Fixes #538 2015-08-13 03:45:24 +10:00
boy0001
5e38d032e0 . 2015-08-12 16:08:26 +10:00
boy0001
a80ac4004f Fix #539 2015-08-12 15:52:21 +10:00
boy0001
3bb5650850 Fix block break offset 2015-08-12 15:11:57 +10:00
boy0001
0d9b6fa6ff Add plot metadata 2015-08-12 14:01:18 +10:00
boy0001
d46475261a Plot border fix + remove debug 2015-08-12 05:29:14 +10:00
boy0001
7d3de207aa Sponge stuff 
Added entity / mob / vehicle / animal / monster caps + entity clearing
on plot clear.
 2015-08-12 04:04:17 +10:00
boy0001
b40c464da9 Tweaks (perms, debug, scripting) 2015-08-11 23:42:46 +10:00
boy0001
994ca12102 Sponge fixes 2015-08-11 22:05:44 +10:00
boy0001
1a9ec84a4d Fixes 
Progress towards #515
Fixes #512
Fixes #514
Fixes (possibly) #529
Fixes #535
Update to latest sponge
 2015-08-11 20:45:13 +10:00
boy0001
b77b550e56 Fixes #534 2015-08-11 07:32:59 +10:00
boy0001
7a6f9e061d Database changes 2015-08-11 07:03:34 +10:00
boy0001
a6d3c77d5a . 2015-08-10 18:09:48 +10:00
boy0001
e28c68ee74 Fixes #524 2015-08-09 19:58:29 +10:00
boy0001
051449157a Fixes #522 2015-08-09 03:27:18 +10:00
boy0001
f6fb7482e1 Fix plot auto merge + plot offset + add unmerge alias 2015-08-09 03:24:01 +10:00
boy0001
cdcfd8c1b5 Changes to world border 2015-08-08 17:41:32 +10:00
boy0001
a2b29da39d Fixes #518 2015-08-08 17:36:02 +10:00
boy0001
64063463ec Fixes #517 + possibly #519 2015-08-08 16:40:43 +10:00
boy0001
d8e7c9805b Add getters to bukkit econ handler. 2015-08-08 02:40:41 +10:00
boy0001
94df643e6e Fix #516 and a related problem 2015-08-08 02:30:21 +10:00
boy0001
b88c6d8d26 Minor optimizations to expire manager 
#469
 2015-08-08 02:09:55 +10:00
boy0001
444e8b346e Removed deprecated in comment 2015-08-07 13:18:14 +10:00
boy0001
d779ca366d Fixes #507 Fixes #485 2015-08-07 11:38:39 +10:00
boy0001
1f2cf4b9cc Fixes #505 2015-08-07 09:30:08 +10:00
boy0001
845aab5937 Remove debug 2015-08-07 02:41:07 +10:00
boy0001
46e48857bf Database correction / Code cleanup, Fixes #490 2015-08-07 02:05:15 +10:00
boy0001
5ea7403d2e Add task complete + plot nearest targeting 2015-08-05 03:37:19 +10:00
boy0001
0d03e9a1d9 height parameter for debugroadregen 2015-08-05 03:08:15 +10:00
boy0001
6944471ad6 Fixed template teleportation if the world hasn't loaded fully 2015-08-05 02:57:28 +10:00
boy0001
64bb860594 Allow debugroadregen to regenerate plot roads 2015-08-05 02:42:11 +10:00
boy0001
df3c62609a Change skyblock home position to center (so you don't fall and die) 2015-08-05 02:01:00 +10:00
boy0001
d780733915 Fixed schematic importing for sponge 2015-08-05 01:54:10 +10:00
boy0001
b77b615dd4 Fixed plot list 2015-08-05 00:32:26 +10:00
boy0001
8e240b5274 stuff 2015-08-04 22:21:12 +10:00
boy0001
76ca8a7376 Some fixes 2015-08-04 04:20:04 +10:00
boy0001
0a0c72bc7d Sorting / Tweaks / Fixes 
Fixes #499
Add sortPlotsByTimestamp method to PS
tweak to debugexec
 2015-08-04 00:54:35 +10:00
boy0001
b0859b250a Fixes #497 2015-08-03 21:18:35 +10:00
boy0001
0b1dbea985 . 2015-08-03 05:25:47 +10:00
boy0001
4d8b9f9674 World generation options for sponge 2015-08-03 05:25:41 +10:00
boy0001
b77c2d1049 optimizations + more sponge work 2015-08-02 21:56:18 +10:00
boy0001
8e1d42d4c5 Fix some more typos 2015-08-02 16:50:53 +10:00
boy0001
16fbd373c9 Fix typo 2015-08-02 16:44:37 +10:00
boy0001
4acf88e09d Permission stuff 2015-08-02 06:11:28 +10:00
boy0001
e314f46c47 Random scripting stuff 2015-08-02 04:01:41 +10:00
boy0001
0a3ec5dcd8 Scripting stuff + remove PlotSquared-Null 2015-08-02 02:12:49 +10:00
boy0001
858d1453f2 Fix typo 2015-08-01 18:43:49 +10:00
boy0001
a4f8292f04 Fix command duplication 2015-08-01 15:16:34 +10:00
boy0001
9b5958da31 Fixes #467 2015-08-01 04:31:50 +10:00
boy0001
222e4faf8b This 2015-08-01 04:27:32 +10:00
boy0001
8cf39be76c Fixed plot visit 2015-08-01 03:24:33 +10:00
boy0001
248ffd9d6e Fixed denying 16 length player names 2015-08-01 03:11:50 +10:00
boy0001
f1d76beb3a Fixed command recommendations 2015-08-01 03:07:49 +10:00
boy0001
de52b70ad3 Fixes plugin version in /plot plugin 2015-08-01 03:03:14 +10:00
boy0001
58cf41bddb Fixes 
Possible fix for trim: #482
Fixes #480
Possible fix for #481
Reduce plot move debugspam
 2015-08-01 03:01:25 +10:00
boy0001
96dd736a6d Fixes 2015-08-01 02:12:53 +10:00
boy0001
9f89928120 Fixed typo 2015-07-31 20:47:10 +10:00
boy0001
6f90700187 Plot info footer 2015-07-31 19:46:07 +10:00
boy0001
0667e885de Some fixes 2015-07-31 15:40:53 +10:00