EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 21:26:45 +01:00
Code Issues Projects Releases Wiki Activity
3,412 Commits 231 Branches 71 Tags 86 MiB
3d47d7e73f
Commit Graph

1011 Commits

Author SHA1 Message Date
NotMyFault
cdc01a5bc4 Reformat debugpaste 
And upgrade from IC -> IS
 2019-08-05 14:03:07 -04:00
MattBDev
1295f7c4bf Merge with breaking 2019-08-05 14:03:06 -04:00
Sauilitired
20dd98d3b9 Use PaperLib and make command task return completable futures 2019-08-05 14:02:30 -04:00
MattBDev
bd51292f4c Get chunks asynchronously 2019-08-05 13:33:27 -04:00
MattBDev
cc45208605 Merge remote-tracking branch 'origin/breaking' into paperstuff 2019-08-05 13:32:19 -04:00
MattBDev
01dfdbe2ef Merge with breaking 2019-08-03 23:26:16 -04:00
MattBDev
bb21abb110 Merge branch 'breaking' into paperstuff 
# Conflicts:
#	Bukkit/build.gradle
#	Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
#	Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerPlotTrustedEvent.java
#	Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Relight.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java
 2019-08-03 23:11:02 -04:00
NotMyFault
6d0849eb66
Merge pull request #2431 from IntellectualSites/kelp-grow 
Add kelp-grow flag
 2019-07-27 21:55:39 +02:00
NotMyFault
dbf5084fa1 Reformat debugpaste 
And upgrade from IC -> IS
 2019-07-25 20:02:39 +02:00
NotMyFault
feda094273 Add kelp-grow flag 
Simply as the name says, add a controlled way to let kelp grow.
 2019-07-20 01:29:30 +02:00
dordsor21
095dccd30f Revert changes to intersection generation 2019-06-28 13:59:57 +01:00
Alexander Krivács Schrøder
d6401d1638 Allow running the road regeneration on a single region 
The plot-based road regeneration from before does not have the same behavior as the real road regeneration code. This new debug operation will regenerate the roads within the region the player is standing using the same code that regenerates all roads. This makes it much easier to tell if things are working correctly and as expected.
 2019-06-16 11:57:35 -04:00
Alexander Krivács Schrøder
7f404e1cf5 Fix plot walls after running regenallroads 
Also clears whatever was above the plot wall, such as pieces of the road.
 2019-06-16 11:57:35 -04:00
Alexander Krivács Schrøder
a94c588a17 Check if location has PlotArea to avoid NPE 2019-06-03 16:26:20 -04:00
Alexander Krivács Schrøder
d106262454 Have PlotAreas create their own PlotManager 
Leads to cleaner code, less need for instanceof and casting, as a PlotArea knows which kind of PlotManager it needs to make
 2019-06-03 16:26:20 -04:00
Alexander Krivács Schrøder
c5bca66618 Remove PlotArea parameter from PlotManager method calls 
As per the previous commit, all PlotManagers now have a reference to their managed PlotArea.
 2019-06-03 16:26:20 -04:00
Alexander Krivács Schrøder
6b3960fc3f Pass the PlotArea into the PlotManager 2019-06-03 16:26:20 -04:00
Alexander Krivács Schrøder
908a5784a1 Cache conversions to BaseBlock and fix leaky abstraction 2019-06-03 16:24:59 -04:00
Alexander Krivács Schrøder
bbff898073 Extract air block into variable to reduce unnecessary function calls 2019-06-03 16:24:59 -04:00
Alexander Krivács Schrøder
19f8704cb4 Remove leftovers from getting rid of PlotBlocks in LocalChunk 2019-06-03 16:24:59 -04:00
Alexander Krivács Schrøder
b366b0d261 Set unspecified blocks from the schematic to air 
If this isn't done, any blocks not specified in the schematic will remain after a clear, which is obviously undesirable.
 2019-06-03 16:24:59 -04:00
Alexander Krivács Schrøder
941821e453 Convert all PlotBlocks to BaseBlocks in the BasicLocalBlockQueue 
The `BukkitLocalQueue` only supports using one of the sets (the removed `baseBlocks` variable in `BasicLocalBlockQueue` was the deciding factor for which one won out) which led to issues with missing blocks when trying to use both types at the same time, such as in the `HybridPlotManager`s `clearPlot` method, where `PlotBlock` is used to fill in the various layers, while the`createSchemAbs` method uses `BaseBlock` for its data.
 2019-06-03 16:24:59 -04:00
MattBDev
475e9b50e1 Fixes #2380 2019-05-31 12:00:44 -04:00
MattBDev
812d41092e Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking 2019-05-31 11:57:18 -04:00
Alexander Krivács Schrøder
41299e6851 Fix issue with plot border during merge 
* `getExtendedTopAbs()` used wrong relative plot for calculating X position.
* Not running `finishPlotMerge()` after every merge led to broken roads during a `merge all`
 2019-05-29 23:28:16 -04:00
Alexander Krivács Schrøder
95cb0d84f0 Fix issue with road generation during unlink 
Roads should always be created with respect to `current`.
 2019-05-29 23:28:16 -04:00
zombachu
fb478de164 Update outdated list of files to check on failed world load (#2365) 2019-05-22 12:09:31 -04:00
MattBDev
1bd7c8ca5f Variable renames 2019-05-21 18:50:52 -04:00
MattBDev
fe471c3571 new library in gradle and another change I can't remember. 2019-05-21 18:32:26 -04:00
MattBDev
8ff833de36 Added Paper to Platform 2019-05-17 18:50:24 -04:00
MattBDev
5dd2610b5e Misc. changes and removal of title manager 2019-05-17 18:49:09 -04:00
MattBDev
4e3a927323 Modifications to the generator code 2019-05-17 16:21:03 -04:00
MattBDev
595a68ecba variable renames 2019-05-17 15:32:05 -04:00
MattBDev
6f5cb30734 Minor message changes and variable changes 2019-05-17 14:38:57 -04:00
MattBDev
b66734a472 Misc. code changes 
A lot of renaming
Some formatting
Narrowed scope of variables
Added annotations
 2019-05-13 21:57:41 -04:00
MattBDev
adefe2eeef Titles can be used on Spigot and Paper now 2019-05-13 18:20:58 -04:00
MattBDev
a841b4ea86 Titles are now exclusive to paper servers 2019-05-10 22:42:07 -04:00
MattBDev
f232334bcc Various formatting tweaks as well as metrics changes. 2019-05-10 21:18:28 -04:00
dordsor21
885d1b9d7e Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking 2019-05-05 16:56:14 +01:00
dordsor21
f6e492638d Bad temporary fix for #2345 - just don't use BukkitLocalQueue#regenChunkSafe and that on 1.14 :) (: 2019-05-05 16:56:00 +01:00
dordsor21
46beb90112
Correcter versioning 2019-05-05 11:58:45 +01:00
dordsor21
0a6fad73c3 Correct versioning 2019-05-05 11:56:08 +01:00
dordsor21
eb9d98d289 Use https://www.athion.net/ISPaster/paste 2019-05-01 19:52:26 +01:00
MattBDev
2ec13e4e76 Replace code with hasFlag() where appropriate. 2019-05-01 12:31:50 -04:00
MattBDev
db6115eae5 Documentation and formatting changes 2019-04-29 15:20:52 -04:00
MattBDev
9e324762b6 Move the update utility setup to it's own method 2019-04-29 15:18:38 -04:00
MattBDev
237b10a2a2 Tidying up the code 2019-04-29 10:49:58 -04:00
dordsor21
bef3dbc6f4 Reformat code 2019-04-23 23:48:22 +01:00
dordsor21
d352804b5d Update gradle lombok version for core 2019-04-23 23:47:00 +01:00
dordsor21
c7ba94f959 Fix legacy material loading error and Jenkins4J dependencies 2019-04-23 23:03:52 +01:00
dordsor21
5ac00c4920 downgrade Jenkins4J 2019-04-23 22:41:06 +01:00
dordsor21
1e97392244 Update to gradle 5.4 2019-04-23 22:27:32 +01:00
Jesse Boyd
0c0a696d36
Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking 2019-04-23 12:57:46 +10:00
Jesse Boyd
21a5b04b7b
remove debug 2019-04-23 12:57:39 +10:00
MattBDev
ef8d33db41 Minor command changes 
Changed RequiredType in some classes and formatting changed in others.
 2019-04-22 11:55:05 -04:00
MattBDev
f5fa15080c Minor javadoc updates 2019-04-22 11:45:23 -04:00
Jesse Boyd
ea26ec628d
Use Settings.Teleport.ON_LOGIN 2019-04-19 13:02:50 +10:00
Jesse Boyd
815e513093
Fix teleportOnLogin error 2019-04-19 12:53:48 +10:00
Jesse Boyd
8ac23b92d8
Use UUID, not just name 2019-04-17 22:18:03 +10:00
Jesse Boyd
d31dbc7c7c
Fix debugimportworlds 1.13 
because someone changed PlotId.fromString to throw an exception without updating things that call it
 2019-04-17 22:07:33 +10:00
Jesse Boyd
000e3de35d
Don't allow importing using base directory 2019-04-17 14:36:31 +10:00
Jesse Boyd
7e63ffe745
Optimize vanilla world generation* 
*For single plot worlds

Reuse base world data. Instead of taking several seconds, it should now take tens of milliseconds.
 2019-04-17 14:30:05 +10:00
Jesse Boyd
0fdc5eafbd
Allow single plot areas to load survival worlds 2019-04-17 13:46:33 +10:00
Jesse Boyd
59f89980a3
Don't need ratio out of 100 anymore 2019-04-17 13:13:56 +10:00
Jesse Boyd
50acf4f51f
Print exception on failed schematic setup 2019-04-13 13:06:21 +10:00
Jesse Boyd
6916752434
Fixes #2322 2019-04-12 12:11:03 +10:00
Jesse Boyd
6cea26f436
Add random collection 2019-04-10 17:10:44 +10:00
Jesse Boyd
533edc5f40
Change default threshold to -1 2019-04-10 17:10:17 +10:00
Jesse Boyd
97903f3870
Fix you are not in a plot area for single plot worlds 2019-04-10 11:34:21 +10:00
Jesse Boyd
9225a13808
sorry for breaking roads 2019-04-09 00:29:13 +10:00
Jesse Boyd
5d515b3863
This shouldn't have been made private 2019-04-06 12:55:45 +11:00
Jesse Boyd
676ef0159a
only change plotY if height not 256 2019-04-06 03:54:27 +11:00
Jesse Boyd
3e3951a3e7
*negate 2019-04-06 02:07:39 +11:00
Jesse Boyd
c71fe00741
Missed this as well 2019-04-06 02:07:14 +11:00
Jesse Boyd
69a029a555
Fix plot schematic y 2019-04-06 01:54:02 +11:00
Sauilitired
3f194f90ce
Unbreakify things 2019-04-04 18:31:47 +02:00
Sauilitired
7e401a83cf
Make PlotLoc's immutable 2019-04-04 18:26:10 +02:00
dordsor21
69b05932eb Update to gradle 5. gradlew clean assemble build actually WORKS 2019-04-03 17:15:09 +01:00
Sauilitired
f5388b9737
Merge remote-tracking branch 'origin/breaking' into breaking 2019-04-01 17:40:10 +02:00
Sauilitired
6323fb0041
Add plot like/dislikes 2019-04-01 17:39:28 +02:00
Jesse Boyd
b1835f0998
whoops, wrong schematic 2019-04-01 21:45:55 +11:00
Jesse Boyd
1c9c0d0207
Schematic fixes 
The 1.13 schematic format uses the `.schem` extension, use that instead
Support loading both legacy `.schematic` and `.schem` files for road
schematics
Fix reading road schematics with an offset
 2019-04-01 21:39:10 +11:00
Sauilitired
0f8b7cd588
fixes #2211 2019-04-01 11:14:47 +02:00
Sauilitired
c450e4aed3
Fix interval flags (fixes #2302) 2019-04-01 10:17:50 +02:00
Sauilitired
14badf8cfc
remove rogue debug message 2019-04-01 09:43:29 +02:00
Sauilitired
df3e78ee40
Make the "Display all commands" message configurable too 2019-04-01 09:04:19 +02:00
Sauilitired
11689bf855
Configurable help categories 2019-04-01 09:00:08 +02:00
Sauilitired
4152582ae0
Fix UUID related NPE 2019-04-01 08:35:06 +02:00
Jesse Boyd
3be7511b7c
Fix genChunk setCuboid 2019-04-01 05:01:32 +11:00
Jesse Boyd
f3adeeac0e
Fix single plot area NPEs & generator stackoverflow 2019-04-01 04:44:18 +11:00
Jesse Boyd
67cf1b45ed
Fix another legacy converter NPE 2019-04-01 04:43:44 +11:00
Jesse Boyd
04b9b67c9d
Fixes #2288 2019-03-31 18:31:16 +11:00
Sauilitired
45360f0979
Make sure /plot home ignores server owned plots 2019-03-30 13:32:45 +01:00
Sauilitired
ae57264487
Add server-plot flag, and option to disable on-claim teleportation 2019-03-30 13:27:18 +01:00
Sauilitired
08ebf57c90
Add hide-info flag 2019-03-30 12:50:32 +01:00
Sauilitired
c6ae2456f2
Add support for Paper async chunk generation 2019-03-26 09:27:20 +01:00
Sauilitired
0b77b863ba
Update notifications. 2019-03-18 19:49:22 +01:00
matt
61cb288382 oops sorry. 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-03-15 13:39:51 -04:00
matt
7f14e88c4c last commit before 4.0.0 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-03-14 21:49:33 -04:00
matt
ed3cadd439 Formatting fixes and minor performance improvement 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-03-08 19:25:59 -05:00
matt
56c24a6a56 Type weakening and Direction changes 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-03-06 12:47:38 -05:00
matt
4c8457ad14 OCD 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-22 11:54:13 -05:00
matt
1755272f81 Merge remote-tracking branch 'origin/breaking' into breaking 2019-02-22 11:51:22 -05:00
matt
25530ed7f0 Doc Updates, Renaming, Reformatting, and a Test 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-22 11:51:06 -05:00
dordsor21
53e732b4fe Make replacing wall on merge configurable 
In case people are doing fun things with road schematics etc :)
 2019-02-22 15:21:44 +00:00
dordsor21
7aebd9b74b Set wall filling on merge 2019-02-22 15:11:35 +00:00
dordsor21
be51d8e159 Correct artifact id for maven 2019-02-22 14:38:18 +00:00
matt
bfc6b62213 Stupid docs 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-21 21:31:12 -05:00
matt
a9bebb10da Merge remote-tracking branch 'origin/breaking' into breaking 
# Conflicts:
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java
 2019-02-21 21:18:03 -05:00
matt
2f18ef6828 Critical bug fixes, reformatting, and cleaning 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-21 21:14:48 -05:00
dordsor21
350e151214 Don't use streams as they're lower performance for our use cases. 
Some minor reformating too.
 2019-02-20 14:50:49 +00:00
dordsor21
d0a4465985 Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking 2019-02-20 11:55:50 +00:00
dordsor21
0ef8b4ad14 Update to WorldEdit's *breaking* Biome handling changes 2019-02-20 11:55:39 +00:00
matt
c5d9412c6c Cleaning and API Addition 
Begins the process of removing "magic values" for directions in the plugin.

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-19 22:57:35 -05:00
matt
92718a5ec8 Merge branch 'consumers' into breaking 2019-02-19 22:29:59 -05:00
matt
099a807ce0 CLeaning of code 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-19 22:29:27 -05:00
matt
df47697ca6 CLeaning of code 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-19 19:00:37 -05:00
matt
b7aeeb151d Replace RunnableVal with java Consumer 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-19 18:39:43 -05:00
matt
a64d764cc1 New API method, more 1.13 entity support, and cleanup. 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-15 12:50:43 -05:00
dordsor21
477e698f7e Reformat 2019-02-13 17:13:57 +00:00
matt
11c4a90cc9 Merge remote-tracking branch 'origin/breaking' into breaking 2019-02-13 12:05:42 -05:00
matt
35493662da Cleanup 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-13 12:05:28 -05:00
dordsor21
3e8308ecd7 Catch statement already being null 2019-02-13 13:35:19 +00:00
matt
17027e6292 Javadoc changes and cleaning of old unused code 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-08 14:49:37 -05:00
matt
e891873d28 Cleaning and scope changes 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-08 11:21:53 -05:00
matt
b39ea1b68b Cleaning and API clarifications 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-06 21:29:51 -05:00
matt
3d8179a4e6 Small tweaks 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-06 17:30:25 -05:00
matt
9101cb9218 PlotComment API tweaks. 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-06 12:33:14 -05:00
dordsor21
d6a801d854 Reformat 2019-02-06 16:42:27 +00:00
matt
0c780166e0 Documentation and PlotId updates 
minor code tweaks in the plot class too

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-06 00:10:05 -05:00
matt
9a23b718f3 Cleanup of various methods 
mainly just more lambda's

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-05 19:41:03 -05:00
matt
e3d43509cf Cleanup of some database methods 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-04 18:00:05 -05:00
matt
dfbcecb081 Removes Cluster Flags 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-04 12:46:27 -05:00
dordsor21
cf82bc5efb Revert 8ac9b86 2019-02-04 15:18:50 +00:00
dordsor21
51afbdfcdc Apply correct codestyle 2019-02-04 13:59:11 +00:00
matt
8ac9b862f8 Major cleanup. 
Added todo comments to many 1.13 issues still lingering. Changed access to some methods to be weaker. Removed cluster flags (most of it). Java 8 stuff added. Hid more PlotSetting methods. etc.

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-01-31 14:20:48 -05:00
NotMyFault
cd8a1a0816
Fixed some translation mismatches 2019-01-27 00:48:03 +01:00
dordsor21
25ed9d2798 Fix road schematic pasting height 2019-01-23 12:23:05 +00:00
Sauilitired
c96a1afaed
Don't fuck up road schematics, I guess 2019-01-22 21:32:24 +01:00
Sauilitired
344a2afeff
Use StringBuilder, like a sane person 2019-01-22 19:54:31 +01:00
Sauilitired
e54f964eca
Fix #2009 2019-01-22 18:51:13 +01:00
Sauilitired
7e56e47046
Fix block list flag permissions 2019-01-21 17:49:36 +01:00
Sauilitired
7edfc313d6
I did an oopsie 2019-01-21 12:24:34 +01:00
Sauilitired
d37f5b9aa8
Fix schematic pasting offsets 2019-01-21 09:53:04 +01:00
Sauilitired
1fbfc767c4
Use PaperLib and make command task return completable futures 2019-01-21 09:20:33 +01:00
dordsor21
bd797b59fe Allow disabling of scientific notation (disabled by default) for DoubleFlags 2019-01-20 15:56:49 +00:00
dordsor21
0609b3d7f6 Safer generation of the BlockBucketChunk 2019-01-19 16:28:49 +00:00
dordsor21
ca883c211a Add merge permission changes from master 2019-01-18 19:02:12 +00:00
dordsor21
ea422b5561 Fix NPE on world initialise 2019-01-17 13:19:24 +00:00
dordsor21
223064567f
Plot analysis (#2239) 
* Start to fix (and may have fixed) plot analysis with block buxkets and 1.13

* Standard deviation ought also be multiplied by 100, and only obtain the BlockBucket array once

* Add schematics to Plot Analysis
Add generateBlockBucketChunk method to SingleWorldGenerator
 2019-01-17 01:04:00 +00:00
matt
0817d7de5a Removed PlotMe converting features. 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-01-15 22:19:29 -05:00
dordsor21
0e0a534620 Fix regenallroads extend (height) 2019-01-16 01:55:45 +00:00
dordsor21
61f8ceaaaa I'm an idiot and left one of my debug messages in 2019-01-16 01:28:07 +00:00
dordsor21
7e6b11a21b Fix plot swap and have a nicer static AIR block 2019-01-15 23:58:21 +00:00
dordsor21
28c219c694 /plot leave has a terrible description 2019-01-15 16:20:50 +00:00
dordsor21
f679d3f873 Debug not debug 2019-01-14 18:27:20 +00:00
dordsor21
232b7ccfc1 Don't allow debugroadregen on merged plots 2019-01-14 18:15:44 +00:00
dordsor21
44fc8a55ea Add "kick" meta check in PlotListener 2019-01-14 17:41:28 +00:00
dordsor21
b2d035cf69 Fix deny-exit flag causing plot kick to break 2019-01-14 17:31:22 +00:00
dordsor21
d81d3c72e4 Update scripts and code to work nicely with each other. 
Fixes #2208
 2019-01-12 19:56:11 +00:00
dordsor21
f62777bc1a Minor: 
Fix BukkitLegacyMappings method map usage
Move obtaining legacy block to default clause
Task should be async
 2019-01-12 18:05:20 +00:00
dordsor21
15ea0f3210 Fix BukkitLegacyMappings having maps the wrong way round & fix PlotBlockListFlag to use PlotBlocks. 
Fixes #2229
 2019-01-12 17:39:29 +00:00
dordsor21
0d76e46fa2 Fix requiring restart for /ps load after /ps save & make descriptions nicer 2019-01-11 12:50:38 +00:00
NotMyFault
222585bf01
Update C.java 2019-01-10 22:21:34 +01:00
NotMyFault
63af0de9f0
Update Settings.java 2019-01-10 22:20:30 +01:00
NotMyFault
5df6f2a13e
Update Download.java 2019-01-10 22:18:28 +01:00
NotMyFault
c5f1c60ad7
Delete base.yml 2019-01-10 22:16:22 +01:00
Sauilitired
3ac7785cc3
Skip empty files in DebugPaste 2019-01-10 21:34:52 +01:00
dordsor21
3bbd97e7e1 Fix PlotDeleteEvent and PlotMergeEvent not being called. 
Replaced current PlotMergeEvent with PlotAutoMergeEvent (called when a plot is merged on /plot auto). And made PlotMergeEvent be called for /plot merge command.
 2019-01-10 17:10:25 +00:00
Sauilitired
e47b4fef20
Remove update and changelog commands 2019-01-10 17:45:40 +01:00
matt
7302480728 Merge branch 'optional' into breaking 2019-01-09 20:01:32 -05:00
NotMyFault
457c520eb6
Fixing debugpaste description 2019-01-09 23:40:08 +01:00
Sauilitired
053edb823d
Use Incendo pasting instead of Hastebin 2019-01-09 23:12:36 +01:00
dordsor21
727d120e70 Regenallroads: 
- remove the "estimated time" as it's just not remotely correct, nor would it be correct if it were based on actual chunk number
 - fix the air to be pasted above the road when using regenallroads
 2019-01-09 16:15:34 +00:00
dordsor21
ea01a5171b Add missing admin unlink permission 2019-01-03 22:36:09 +00:00
dordsor21
77ddeabca2 Fix NPE with plot version (update to new versioning within code) 
Also add date and commit to plugin.properties file.
 2019-01-03 17:32:21 +00:00
matt
e12a7bb85f Migrated remaining Optionals 2019-01-02 23:15:42 -05:00
matt
c7b9bfeb4b Migrate from Guava Optionals to Java Optionals 2019-01-02 23:11:26 -05:00
dordsor21
ae9e52f093 Don't dump g_sch 2019-01-02 13:18:20 +00:00
dordsor21
29868bdd29 Fix road generation for roads of even width 2019-01-01 14:43:41 +00:00
Sauilitired
38a382f8e5
Add missing argument to unlink 2019-01-01 00:55:25 +01:00
dordsor21
7bcc4c4ce3 Fix plot move/swap block rotation issue (switch to BaseBlock). Also fix container inventory pasting. 
Some cleanup.
Fixes #2209
 2018-12-31 17:15:47 +00:00
dordsor21
8c52e20736 Use BaseBlocks in regenallroads and minor cleanup of HybridUtils. 
Fixes #2210
 2018-12-31 16:08:09 +00:00
dordsor21
750be6c5fe clean merge up 2018-12-28 17:03:00 +00:00
Rick Strafy
6292bff7c9 Fix rotation (#2200) 
* Fix rotation

* Clean up some events and utility classes. Try to use as general type
declarations as possible. Add configurable override for the unsafe block checker.

* Treat tridents as a projectile

* Fix rotation and merged with current breaking branch
 2018-12-28 09:42:03 +00:00
Sauilitired
12b8ae3eed
Clean up some events and utility classes. Try to use as general type 
declarations as possible. Add configurable override for the unsafe block checker.
 2018-12-28 07:39:39 +01:00
dordsor21
660754511b Fix rotation of road schematics 2018-12-28 00:47:48 +00:00
dordsor21
2846363a2c Revert "Use our own schematic readers in only create one input stream, and allow for future customisation of schematics if required/wanted." 
This reverts commit 3521b8aa22.
 2018-12-27 20:06:02 +00:00
dordsor21
3521b8aa22 Use our own schematic readers in only create one input stream, and allow for future customisation of schematics if required/wanted. 2018-12-27 19:42:56 +00:00
Sauilitired
249b5d4068
Revert dors commit 2018-12-27 17:29:35 +01:00
Sauilitired
76113cb0ab
Allow specifying Y value for default plot home 2018-12-27 16:18:54 +01:00
matt
a529518b91 Minor changes, formatting, comments. 
One notable thing added was the inclusion of more of the new mobs in one of the events.
 2018-12-27 00:46:32 -05:00
Alexander Söderberg
75bcd1adec
Update StringMan.java 2018-12-27 01:31:48 +01:00
dordsor21
fba7eac6d8 Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking 2018-12-26 21:18:38 +00:00
dordsor21
6e127db982 Cleanup 2018-12-26 21:18:22 +00:00
Sauilitired
f1cf541606
Merge remote-tracking branch 'origin/breaking' into breaking 2018-12-26 19:16:42 +01:00
Sauilitired
2b9fe5afda
Fix plot music (and plot inventories) 2018-12-26 19:16:34 +01:00
dordsor21
ba47a21971 - Update code style to format annotations nicely 
- Reformat code
 2018-12-26 17:21:06 +00:00
dordsor21
8cb2bdc846 Nice code to handle schematic loading and remove the ability to debugroadregen a specific chunk, as it uses a completely different method to actual road generation. 2018-12-26 16:44:39 +00:00
Sauilitired
b05316c000
Recommend paper just like FAWE. I want to be like the cool kids. 
Oh, and fix an issue with `/plot music`. Still broken. Just not
the same kind of broken.
 2018-12-26 15:29:39 +01:00
Sauilitired
f1378013c1
Fix plot home 2018-12-26 01:39:49 +01:00
Sauilitired
edc758334c
Actually copy over the files as well... 2018-12-25 18:30:42 +01:00
Sauilitired
beb0f5708f
Whoops... 2018-12-25 18:28:07 +01:00
Sauilitired
71baee063c
Update maven info for Core 2018-12-25 18:27:07 +01:00
dordsor21
c14b76b324 Fix rotational blocks in road generation 2018-12-24 23:14:13 +00:00
dordsor21
af23d3d98e Fix schematic pasting to paste tile entities and blocks with BlockData (e.g. stairs) properly 2018-12-24 17:56:13 +00:00
Sauilitired
9fe9c2662b
Fix legacy conversion of block lists 2018-12-24 08:57:17 +01:00
Sauilitired
9e0c226632
Fix schematic pasting 2018-12-24 08:13:15 +01:00
Sauilitired
4f43788307
Merge remote-tracking branch 'origin/breaking' into breaking 2018-12-24 01:50:45 +01:00
Sauilitired
8dae2555db
Make mv create work again 2018-12-24 01:50:17 +01:00
dordsor21
1bf621fb4b Fix schematic saving (and improve performance slightly) 2018-12-23 22:49:43 +00:00
Sauilitired
2ede77318a
Add dordsor21 to author list 2018-12-23 20:32:48 +01:00
Sauilitired
5c678e86bb
Fix configuration loading issues 2018-12-23 20:31:29 +01:00
Sauilitired
02937cc543
Add configuration conversion and fix BukkitLegacyMappings 2018-12-23 19:43:36 +01:00
Sauilitired
165cac8b13
Fix bStats problem and commit Setup progress 2018-12-23 17:38:27 +01:00
Sauilitired
7900a95b25
Implement LegacyConverter 2018-12-21 22:55:47 +01:00
Sauilitired
fe12d03916
Remove unused classes. 2018-12-21 21:28:33 +01:00
dordsor21
886081e27f The local build was a fluke, and I couldn't work it out in the last 3 hours, so here are some basic updates/cleanup to a few things, and an updated bui;d command in README.md 2018-12-21 16:26:19 +00:00
dordsor21
e757c3e13c Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking 2018-12-21 13:39:27 +00:00
dordsor21
5fdb60f85d Default plot height is at sea level (62) 2018-12-21 13:39:20 +00:00
dordsor21
aaed3f622a Fix build for gradlew clean assemble build 2018-12-21 13:38:28 +00:00
sauilitired
130274de86 Fix multiverse setup and don't allow unsafe blocks in setup 2018-12-21 03:31:08 +01:00
dordsor21
28f3be56b3 Fix schematic creation 
Seems fairly ugly, but only because the format requires the blocks be inputted in that exact order, and it prevents us from having to cache the blocks per chunk to then insert into the relevant tags.
 2018-12-21 00:49:15 +00:00
dordsor21
c53cd1ec91 oops 2018-12-20 23:34:55 +00:00
dordsor21
90682e9f8b Various: 
- Some minor cleanup
 - Test for null id, not for null PlotBlock
 - Small fixes to schematic saving (still broken)
 2018-12-20 23:33:24 +00:00
sauilitired
341e386df8 Delete Collection getBlocks to Array getBlocks 2018-12-20 21:46:00 +01:00
sauilitired
f4140ae728 Add getBlockArray() method 2018-12-20 21:40:50 +01:00
dordsor21
4e10682748 A few minor fixes 2018-12-20 18:46:52 +00:00
sauilitired
096ad1febe Make sure that blocks are actually compiled. Whoopsie 🐮 2018-12-20 19:35:02 +01:00
dordsor21
1543ac50cd Various: 
- Empty StringPlotBlocks are air
 - Update signs to 1.13
 - Fix getting material in BukktiLocalQueue#setMaterial
 2018-12-20 17:20:13 +00:00
sauilitired
568b4c8e85 Merge remote-tracking branch 'origin/breaking' into breaking 
# Conflicts:
#	Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
#	Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
 2018-12-20 02:25:55 +01:00
sauilitired
e939b8237e Changelist: 
- Added aliases for custom configuration types
- Removed numerical ID based methods in Block Queues
- Fixed sign removal in Plot.java
- (Hopefully) fixed dividing by 0 errors in BlockBucket
- Removed random from some methods, as blockbucket has it's own random
- Temporarily removed chunk analysis
- Changed a lot in GenChunk and BukkitPlotGenerator
 2018-12-20 02:23:48 +01:00
dordsor21
cbc2b70336 Merge commit 'be485075993f8dc807595c524f58c3bb58156a0c' into breaking 
# Conflicts:
#	README.md
 2018-12-20 00:55:44 +00:00
dordsor21
11ccfe7ac4 Reformat code 2018-12-19 23:26:20 +00:00
dordsor21
fa2dbb2b89 Update to WorldEdit 7 (and WE7-compatible schematics, *hopefully keeping legacy*) 2018-12-19 23:18:57 +00:00
sauilitired
e724aa8caf Fix PlotItem. 2018-12-19 18:24:35 +01:00
sauilitired
8f23299e7d Use BlockBuckets everywhere. 2018-12-19 17:19:54 +01:00
dordsor21
361cc9e9f7 Remove old LegacyMappings class from Bukkit 
Add "fromAny" method
 2018-12-19 15:08:49 +00:00
dordsor21
531d8cc706
Merge branch 'breaking' into breaking 2018-12-19 14:54:32 +00:00
dordsor21
4b02bb1df8 Refactor legacy mappings to use PlotBlocks 2018-12-19 14:52:15 +00:00
sauilitired
1d3270d869 BlockBuckets r cool 🐮 2018-12-19 00:01:13 +01:00
sauilitired
af9418552a Whoops. 2018-12-18 20:58:52 +01:00
sauilitired
10b87f5728 Add mappings for pre initialized items 2018-12-18 20:56:55 +01:00
sauilitired
ccad0bced9 Progress. 2018-12-18 20:54:20 +01:00
sauilitired
fb7bcef05f 1.13 shizzle 2018-12-17 20:57:21 +01:00
NotMyFault
8ad75efa0e Adding French translation 2018-12-12 16:12:40 +01:00
sauilitired
820710721e Schematic list command 2018-12-06 18:01:33 +01:00
sauilitired
a4a923c23c Extract duplicated switch statement in EntityUtil 2018-11-15 00:08:32 +01:00
sauilitired
06f64aeff0 Extract duplicated method declaration 2018-11-15 00:06:20 +01:00
sauilitired
a8b4729845 Rename DBFunc#everyone to DBFunc#EVERYONE, and create two string constants 🐱 2018-11-14 23:51:56 +01:00