Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-02 08:50:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,448 Commits 13 Branches 68 Tags 88 MiB
254a0541cc
Commit Graph

633 Commits

Author SHA1 Message Date
Sauilitired
20dd98d3b9 Use PaperLib and make command task return completable futures 2019-08-05 14:02:30 -04:00
MattBDev
d6779d977a Fixes #2423 2019-07-21 20:43:36 -04:00
MattBDev
e8df39d3c4 Fixes #2435 2019-07-21 20:40:04 -04:00
Jesse Boyd
23b88a375d
player interact ignore cancel 2019-07-12 02:18:08 +10:00
dordsor21
246845607f Let's first test against Material.matchMaterial for material matching (: 
Also update some dependencies
 2019-06-27 15:18:54 +01:00
dordsor21
83d1f1d629
1.14 id support (#2404) 
* Plausible fix for 1.14 support.
- Allow 1.14 blocks to be specified in LegacyBlocks, but only saved if the server version is 1.14.
- No snazzy config conversion, but it seems most people managed to figure it out on their own anyway

* Ignore the "severe" output because of new 1.13/14 blocks

* fix oak_wall_sign for 1.14
 2019-06-24 13:37:59 +01:00
dordsor21
485415c551
1.14 id support (#2403) 
* Plausible fix for 1.14 support.
- Allow 1.14 blocks to be specified in LegacyBlocks, but only saved if the server version is 1.14.
- No snazzy config conversion, but it seems most people managed to figure it out on their own anyway

* Ignore the "severe" output because of new 1.13/14 blocks
 2019-06-23 14:17:44 +01: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
6b3960fc3f Pass the PlotArea into the PlotManager 2019-06-03 16:26:20 -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
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
427523644c Removed unused imports 2019-05-31 12:04:38 -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
84911c1a8c Remove unused title classes 2019-05-13 18:22:17 -04:00
MattBDev
adefe2eeef Titles can be used on Spigot and Paper now 2019-05-13 18:20:58 -04:00
MattBDev
4daf1c7721 Fixes #2355 2019-05-13 15:56:28 -04:00
MattBDev
0d67c174aa Fix compatibility with 1.13 and 1.14 2019-05-10 23:00:11 -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
MattBDev
d8ac6115c7 I never thought it would come to this 2019-05-10 17:16:48 -04: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
MattBDev
2ec13e4e76 Replace code with hasFlag() where appropriate. 2019-05-01 12:31:50 -04:00
MattBDev
f72d39ed85 Fixes #1318 2019-05-01 12:11:35 -04:00
MattBDev
72291b09f2 Fix the actual issue and remove whatever junk from the previous commit 2019-04-30 15:11:43 -04:00
MattBDev
ac5cdfae64 Fix for ItemFrames 2019-04-30 14:44:33 -04:00
MattBDev
db6115eae5 Documentation and formatting changes 2019-04-29 15:20:52 -04:00
MattBDev
299fac95fb Add a stupidity fail-safe. 2019-04-29 11:02:47 -04:00
MattBDev
237b10a2a2 Tidying up the code 2019-04-29 10:49:58 -04:00
MattBDev
0b7e63bafb Added new 1.14 blocks 2019-04-24 22:04:30 -04:00
MattBDev
9f792fa54b Fixes #2328 
I hope this doesn't cause more issues than it solves
 2019-04-24 21:23:57 -04:00
MattBDev
d0be0780fd Reformatting and cleaning. 2019-04-24 16:11:24 -04:00
dordsor21
bef3dbc6f4 Reformat code 2019-04-23 23:48:22 +01:00
dordsor21
9485f82ea9 Fix signs between 1.13 and 1.14 2019-04-23 23:46:10 +01:00
dordsor21
c7ba94f959 Fix legacy material loading error and Jenkins4J dependencies 2019-04-23 23:03:52 +01:00
dordsor21
bd1217810f Should fix the sign issue 2019-04-23 22:30:31 +01:00
MattBDev
9b3ca4468c Temporary fix for a working 1.14 build 2019-04-23 14:41:20 -04:00
MattBDev
b2b2f3cd05 attempt to fix signs 2019-04-23 14:24:55 -04:00
MattBDev
1118901ca2 Initial 1.14 Update 2019-04-23 13:45:24 -04:00
Jesse Boyd
145af1e091
fix workaround 2019-04-23 01:53:24 +10:00
Jesse Boyd
406dd22703
Workaround for effective permission check 2019-04-23 01:06:41 +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
27eda9eb7c
Don't setup single plot worlds 2019-04-17 14:00:01 +10:00
Jesse Boyd
04779d28fb
Don't fail on metrics error 2019-04-13 12:26:19 +10:00
MattBDev
1c915905c6 Fixes #2275 2019-04-11 23:27:47 -04:00
Jesse Boyd
e0bd8e3f9d
Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking 2019-04-09 00:29:30 +10:00
Jesse Boyd
9225a13808
sorry for breaking roads 2019-04-09 00:29:13 +10:00
Jesse Boyd
3f712ed5f0
should check both end/nether 2019-04-08 18:03:38 +10:00
Jesse Boyd
259fe94f83
Potential fix to skip chunks being kept loaded 2019-04-08 01:43:38 +10:00
Jesse Boyd
3651b3ac8d
I don't know about coffee, but how about Java? @sauilitired 2019-04-06 23:14:39 +11:00
Jesse Boyd
b32b8a98e2
Fixes #1936 2019-04-06 17:19:48 +11:00
Jesse Boyd
69a029a555
Fix plot schematic y 2019-04-06 01:54:02 +11:00
Sauilitired
7e401a83cf
Make PlotLoc's immutable 2019-04-04 18:26:10 +02:00
Jesse Boyd
6b422582a6
Load WorldEdit onEnable 
as otherwise it doesn't work
 2019-04-04 00:19:59 +11:00
Sauilitired
c450e4aed3
Fix interval flags (fixes #2302) 2019-04-01 10:17:50 +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
e396da8ee5
fix converter NPE 2019-04-01 03:19:53 +11:00
Sauilitired
ae57264487
Add server-plot flag, and option to disable on-claim teleportation 2019-03-30 13:27:18 +01:00
Sauilitired
c6ae2456f2
Add support for Paper async chunk generation 2019-03-26 09:27:20 +01:00
dordsor21
c9f38430c6 Clean and fix up the fromAny method in Legacy Mappings 
it never checked for an id data pair or singular id (5, 5:2 etc) which is sort of the whole point. Fixes #2296
 2019-03-20 17:17:45 +00: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
cf1764723f Fixes #2291 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-03-12 16:56:51 -04:00
matt
7b788c07b8 Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking 2019-03-09 00:05:49 -05:00
dordsor21
dffbaf89a3 Fix for offhandedness 2019-03-09 00:28:21 +00:00
matt
578069b3c9 Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking 2019-03-08 19:26:06 -05: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
dordsor21
aa894b8ad9 Fixes #2245 
Also some minor fixes to PlayerInteractEvent main/off hand logic
 2019-03-09 00:12:21 +00:00
dordsor21
ed10877431 Should fix IndexOutOfBoundsException when copying 
fixes#2290
 2019-03-08 23:04:38 +00:00
matt
1d327ec346 Fixes an issue with boats 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-03-07 18:38:21 -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
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
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
matt
df47697ca6 CLeaning of code 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-19 19:00:37 -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
b999cb4195 Fix players being able to place boats, armorstands etc using offhand 2019-02-14 17:38:36 +00:00
dordsor21
130e1b6300 Fix armorstands, boats etc being placeable on players plots with "use 0" flag 2019-02-13 21:47:54 +00: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
8710f2f83b Fix NPE when right-clicking a >1.13 block 2019-02-13 13:43:22 +00:00
dordsor21
dae7bbdf9d Fix dropped items being removed from plots 2019-02-13 13:26:19 +00:00
dordsor21
d0994f1b4b Fixes to EntityTask 2019-02-10 23:03:14 +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
dordsor21
6711788dd0 Fix ClassCastException in runEntityTask 2019-02-06 16:38:01 +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
87547834ef Minor changes to variable names and castings 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-05 23:12:01 -05:00
matt
ccc53278a1 Fix the world border issue 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-05 20:36:42 -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
14e1296e13 Only thing I can think of in 8ac9b86that would be causing the lack of plot owners (before reverting the commit) 2019-02-04 14:24:17 +00:00
dordsor21
6d6087b1e3 And don't add the Core/ code into Bukkit/ code 2019-02-04 14:02:21 +00:00
dordsor21
51afbdfcdc Apply correct codestyle 2019-02-04 13:59:11 +00:00
dordsor21
9c90928d07 Remove the debug and don't created a new BloxkBucket for every air block. 2019-02-02 16:13:55 +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
dordsor21
a4c3fb26c7 Check for road or unowned plot 2019-01-23 14:02:18 +00:00
dordsor21
fd4a5f2aaa Fix item despawning on plots 2019-01-23 13:34:23 +00:00
Sauilitired
8733dc6dab
Fix deny-teleport flag: Fixes #2128 2019-01-22 10:43:29 +01:00
Sauilitired
7edfc313d6
I did an oopsie 2019-01-21 12:24:34 +01:00
dordsor21
0609b3d7f6 Safer generation of the BlockBucketChunk 2019-01-19 16:28:49 +00:00
dordsor21
330ab83ece possible NPE fix and add useful debug if it fails 2019-01-17 22:34:28 +00:00
dordsor21
db2e245b13 alphabetise PlayerEvents stuff and add Turtle Eggs 2019-01-17 16:28:42 +00:00
dordsor21
f366f5e406 Remove needless generateExtBlockSections method that just reduced performance for no reason 2019-01-17 01:06:32 +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
7e6b11a21b Fix plot swap and have a nicer static AIR block 2019-01-15 23:58:21 +00:00
dordsor21
b2d035cf69 Fix deny-exit flag causing plot kick to break 2019-01-14 17:31:22 +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
Logan Fick
8ba661aa35 Fixed plot owner UUIDs getting unnecessarily randomized. (#2233) 2019-01-12 17:48:53 +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
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
matt
7302480728 Merge branch 'optional' into breaking 2019-01-09 20:01:32 -05:00
Sauilitired
053edb823d
Use Incendo pasting instead of Hastebin 2019-01-09 23:12:36 +01:00
matt
c7b9bfeb4b Migrate from Guava Optionals to Java Optionals 2019-01-02 23:11:26 -05:00
dordsor21
f8ce00c2df Also cancel picking water/lava up with a bucket. 2018-12-31 18:03:59 +00:00
dordsor21
6a9038c306 Fix #2205 2018-12-31 17:57:17 +00: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
3156741664 Fix plot redstone disabling (not sure why it was the way it was, but it was never going to work, so I fixed? it) 
also minor reformat to PlayerEvents
 2018-12-28 17:25:29 +00:00
Sauilitired
f25581c3f1
Treat tridents as a projectile 2018-12-28 08:14:47 +01: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
Sauilitired
249b5d4068
Revert dors commit 2018-12-27 17:29:35 +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
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
d12bdcfda4
Fix NPE on VehicleMoveEvent. Fixes #2195. 2018-12-26 19:25:20 +01: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
Sauilitired
5bdc5a0fcc
Fix road schematics but for real this time 2018-12-26 17:24:35 +01:00
Sauilitired
2ebb7d11a8
Fix road schematics 2018-12-26 17:05:37 +01:00
Sauilitired
1d08f4d4ff
Include a rationale like Spottedleaf was kind enough to suggest 2018-12-26 15:38:31 +01: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
afb0a9f17f
Forcefully load WorldEdit on startup 2018-12-25 12:05:01 +01: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
dordsor21
1bf621fb4b Fix schematic saving (and improve performance slightly) 2018-12-23 22:49:43 +00: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
MattBDev
c1fa6c842d Removing old Metrics class 
We don't need any fancy metrics at the moment. They can be added later if needed.
 2018-12-21 23:38:01 -05:00
sauilitired
23b9eca4ab Add bStats support, seeing as mcstats has been down for ages 2018-12-21 21:10:37 +01:00
sauilitired
dff64c5c68 Add support for 1.13 blocks 2018-12-21 17:49:04 +01:00
dordsor21
8bc0bcd9e6 Update BukkitUtil#isBlockSolid to 1.13 2018-12-21 01:04:37 +00:00