EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-26 23:26:45 +01:00
Code Issues Projects Releases Wiki Activity
4,903 Commits 232 Branches 71 Tags 87 MiB
75f31c5bf6
Commit Graph

793 Commits

Author SHA1 Message Date
Traks
2e64ac6d25
Revert projectile hit on splash (#3162) 
* Revert projectile hit on splash

* Notes about potions splashing after hit cancelled
 2021-07-15 18:43:05 +02:00
Traks
cc60d50dd2
Actually cancel projectile hit events (#3154) 
Co-authored-by: NotMyFault <mc.cache@web.de>
 2021-07-13 08:57:12 +00:00
NotMyFault
635e18e7ed
Add copper-oxide flag 2021-07-10 15:50:38 +02:00
dordsor21
b9cb6842e2
Add an online check for teleport listener 
- Some plugins seem to like teleport players before they're online (e.g. NoCheatPlus)
 - Addresses #3142
 2021-07-10 10:40:44 +01:00
NotMyFault
3b5b51b40c
Update link if outdated Fawe version is spotted 2021-07-02 14:22:33 +02:00
NotMyFault
8e23b10f7c
Fix update notification ingame message 2021-06-27 18:11:57 +02:00
dordsor21
a5452012b5
separate 1.17-only events 2021-06-26 20:08:25 +01:00
dordsor21
67bbd64fa1
Update to FAWE 1.17 2021-06-26 16:19:07 +01:00
NotMyFault
6a57a5c369
Fixes #3100 2021-06-24 16:40:10 +02:00
NotMyFault
9fa0a8b27b
Update ServerLib & remove Java version check 
We now require Java 16 onwards
 2021-06-22 23:49:31 +02:00
NotMyFault
9acf9f4f19
Improve documentation of deprecated methods 2021-06-22 18:11:48 +02:00
SirYwell
0e84cf085b Fix compatibility issues with Citizens (fixes #3105) 2021-06-22 10:18:48 +02:00
NotMyFault
45c566859e
Don't fail loading on versions prior to 1.17 2021-06-21 10:30:48 +02:00
NotMyFault
4dbbf8f599
1.17 (#3088) 
* Minor work for 1.17

* Address TODOs

Introduce `entity-change-block` flag covering blocks affected by `onPeskyMobsChangeTheWorldLikeWTFEvent`. Previously this was covered by the mob-place flag, however, changing the tilt state of big drip leafs and a series of other blocks call `EntityChangeBlockEvent` so this shouldn't be covered by mob flags only.

* Address other TODOs

* Compile against paper 1.17

This will only work if you built paper locally and deployed it to your local maven repo.

* Updated linked javadoc links

* Handle sculk sensor events in a more controllable way

* Update issue forms for 1.17
 2021-06-20 18:17:18 +02:00
dordsor21
a3ebabacb8
Fix #3095 2021-06-18 15:45:45 +01:00
NotMyFault
b196c9ce8e
Fix place flag message 2021-06-16 01:15:09 +02:00
dordsor21
3cd9b76805
Implement "off" to PlotWeather flag and make it default 
- Players with "player weather" will no longer have their weather reset on plots that do not set the PlotWeather flag
 2021-06-10 11:43:12 +01:00
dordsor21
f0cbc4f23e Add whenDone task to setCuboids and ensure whenDone tasks are added to the queue before FAWE might do something 2021-06-09 13:09:50 +01:00
dordsor21
9bd14b142b Move FAWE detection before guice injection/configuration 2021-06-09 13:09:50 +01:00
dordsor21
4ba1217b84 Fix licences 2021-06-09 13:09:50 +01:00
dordsor21
50d4353045 begin integration with fawe 2021-06-09 13:09:50 +01:00
NotMyFault
f4552e358d
Fixes #3027 
- Ditch slf4j in favor of log4j. slf4j is (unfortunately) very much unmaintained at this time and future versions of MC (1.17+) will use log4j version 2.14.1 onwards over some ancient sfl4j version.
- Using log4j reduces our jar size as well, because we don't need to bridge it as the game provides it natively.
 2021-06-03 12:40:27 +02:00
Patrick "IPat" Hein
8a244d12fc
Fix if-condition limited to roads for animal attack cancelling on plots (#3079) 
* Negate mob-place flag debug message

* fixed a little typo :)

* Added check for dragon egg teleportation event
https://github.com/IntellectualSites/PlotSquared/issues/3074

* Basic dragon egg interact bugfix (Left-click interaction)

* Lifted admin if-condition out of roads (out-of-plot) only block (for animals)

Co-authored-by: NotMyFault <mc.cache@web.de>
 2021-06-02 19:55:35 +02:00
Patrick "IPat" Hein
2045a4988d
Prevent dragon eggs from leaving or entering plot bounds (#3075) 
* Negate mob-place flag debug message

* fixed a little typo :)

* Added check for dragon egg teleportation event
https://github.com/IntellectualSites/PlotSquared/issues/3074

* Basic dragon egg interact bugfix (Left-click interaction)

Co-authored-by: NotMyFault <mc.cache@web.de>
 2021-05-28 10:57:48 +02:00
NotMyFault
87706d471b
Add option for legacy sign material 
Follow up to cde27899dd
 2021-05-22 12:34:04 +02:00
NotMyFault
a17085bb18
Remove dead imports 2021-05-21 20:56:44 +02:00
NotMyFault
cde27899dd
Fixes #3064 2021-05-21 19:14:13 +02:00
NotMyFault
7775cd0073
Do not rely on a static file path 
Doing so will cause issues with the `--plugins` flag.
E.g. `java -jar server.jar --plugins /path/to/plugins/`
 2021-05-21 00:35:19 +02:00
Patrick "IPat" Hein
eb9d7e97d9
Bug through last Economy PR - Withdrawn money for non-affordable plots (#3036) 
* Replaced economy supported (Vault) check within cost condition with a pre-eliminating if-guard

* Negate mob-place flag debug message

* Actually prevent purchase of plots if they can't afford it (whoops)

Co-authored-by: NotMyFault <mc.cache@web.de>
 2021-05-19 17:44:45 +02:00
Patrick "IPat" Hein
7c4a85325c
Added event handler for cauldron water level modification to prevent untrusted players interacting with a plot (#3035) 
* Added check for burning players using non-trusted plots cauldrons to extinguish themselves, causing the cauldron level to decrease

* Cancelling burning of players without downscaling water instead of ignoring their burn status

* Using Java 14 JEP 305 enhanced instanceOf

Co-authored-by: NotMyFault <mc.cache@web.de>

* Players without permissions may not wash banners or armor now either. Rain modification is now permitted.

* Extinguishing is now explicitly handled so that event handling for other plugins has the actual information of the new cauldron water level

* Un-nestified the if-condition :)

* Properly cancelled the event (since it is semantically cancelled)

* (Actually) properly cancelled the event (since it is semantically cancelled)

Co-authored-by: NotMyFault <mc.cache@web.de>
 2021-05-18 19:23:22 +00:00
SirYwell
94ba90d694 Always initialize PermissionHandler (fixes #3019) 2021-05-18 21:17:47 +02:00
NotMyFault
e97bc25fb8
Log plot chat to console 
- Fix plot music removal template
- Fix debug args
 2021-05-17 10:35:09 +02:00
NotMyFault
3748d8e246
Minor cleanup in favor of Java 16 
- Addressing a few command deprecations during the major release superseded by toggles
- Don't swallow SQL warnings in loggers behind debug, as it's often set to false
- Deleted JavaVersionCheck, it's part of ServerLib.
 2021-05-15 20:39:16 +02:00
NotMyFault
0341111f8f
Add lectern-read-book flag 
Fixes https://github.com/IntellectualSites/PlotSquared/issues/2980
 2021-05-14 18:22:02 +02:00
NotMyFault
a7c4b40fcc
Add no-portals and deny-portal-travel flag 2021-05-14 15:51:20 +02:00
NotMyFault
0106a4222d
Address a few deprecations 2021-05-01 18:33:02 +02:00
NotMyFault
361b936aa0
Update ServerLib 2021-04-27 11:58:49 +02:00
NotMyFault
de597391dc
Fix keep-inventory flag & adjust disallowed-blocks translation 2021-04-21 11:03:14 +02:00
NotMyFault
59599261ff
Fixes https://issues.intellectualsites.com/issue/PS-237 2021-04-12 16:08:31 +02:00
NotMyFault
e1fb8c1ae5
Take building min height also into consideration 2021-04-11 10:12:37 +02:00
NotMyFault
5780ad370a
Strip Java 15 note 2021-03-01 10:58:27 +01:00
Hannes Greule
38b60205e8 Use javax for Nullable + guice, hope I didn't miss anything 2021-02-24 20:35:38 +01:00
NotMyFault
027456fd77
Add crop-grow flag 2021-02-24 18:41:36 +01:00
NotMyFault
da45813a06 Add new metrics pies 2021-02-22 15:18:20 +01:00
NotMyFault
aaf2fa8807
Update bStats to 2.1.0 2021-01-24 10:39:03 +01:00
NotMyFault
86e8457574
Move to ServerLib 2021-01-22 23:34:47 +01:00
Alexander Söderberg
8292ed9e31
More annotation work 2021-01-10 00:01:48 +01:00
Alexander Söderberg
57fc51d013 Initial annotation usage cleanup + EditorConfig 2021-01-09 22:28:41 +01:00
dordsor21
8b332adbe7 Address comments 2021-01-09 21:34:42 +01:00
dordsor21
3cea734b9b Fix singleworlds 2021-01-09 21:34:42 +01:00
dordsor21
7ac3f7ca03 Fix sync tasks not being sync 2021-01-09 20:39:25 +01:00
dordsor21
98e8476a88
Bring v5 entity spawn changes to v6 2021-01-06 21:56:26 +00:00
Hannes Greule
ad99ca1723
Use WE Expressions instead of js evaluation (#2941) 
* Implement thread-safe expression evaluation

* Update `{args}` to `plot` automatically

* Stringify more money/balance/price occurrences with EconHandler#format
 2021-01-02 16:32:07 +00:00
N0tMyFaultOG
f47561b580
Invert leaf-decay message 2021-01-01 21:51:28 +01:00
N0tMyFaultOG
4f60da292a
Add leaf-decay flag 
Stop leaves from decaying.
 2021-01-01 21:47:09 +01:00
N0tMyFaultOG
70fb86a1c3
Remove redundant legacy version check 
"api-version" backs us up here.
 2021-01-01 14:09:59 +01:00
N0tMyFaultOG
e8642df674
Update licenses to 2021 
Happy new year 🎆
 2021-01-01 00:19:45 +01:00
Hannes Greule
fafdae9ba9
Only check ice-form for ice (#2940) 
Co-authored-by: NotMyFault <mc.cache@web.de>
 2020-12-28 14:11:30 +00:00
dordsor21
3cfbe9585a
Merge branch 'v6' of github.com:IntellectualSites/PlotSquared into v6 2020-12-28 12:27:12 +00:00
dordsor21
71305e636c
cache bukkitworld 2020-12-28 12:10:27 +00:00
Hannes Greule
019da4d2f4 Expose legacy serializer for placeholders 2020-12-28 11:21:35 +01:00
N0tMyFaultOG
07491d8028
Rename database chart id 2020-12-22 20:53:13 +01:00
N0tMyFaultOG
8c3a0a8275
Fix compiling 2020-12-21 20:33:49 +01:00
N0tMyFaultOG
bb52301200
Merge remote-tracking branch 'origin/renovate/configure' into v6 2020-12-20 22:38:35 +01:00
N0tMyFaultOG
5147d67318
Add charts for complex plot components 2020-12-16 13:20:23 +01:00
dordsor21
992a683ba2
another annoying cache thing 2020-12-14 15:22:10 +00:00
dordsor21
e8e116312a
Merge branch 'v5' into v6 
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java
#	Core/src/main/java/com/plotsquared/core/command/Deny.java
#	Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
 2020-12-14 15:15:27 +00:00
dordsor21
de3ba9a25c
re-send block change for blocks with gravity if they're physicsed 
fixes PS-159
 2020-12-14 14:53:53 +00:00
dordsor21
6eb2958afc
Fix merge issue 2020-12-11 11:42:19 +00:00
dordsor21
18f13b7d15
Merge branch 'v5' into v6 2020-12-10 21:28:28 +00:00
dordsor21
b4f3e85001
allow "owned" road mobs to be killed as well 
(those that are leashed, being ridden, etc)
 2020-12-10 21:14:32 +00:00
N0tMyFaultOG
3ca8a94419
Update java 8 notice 2020-12-08 00:18:40 +01:00
N0tMyFaultOG
714837dd00
Add charts for complex components 2020-12-07 23:05:25 +01:00
Alexander Söderberg
c8ad936d26
Clean up PlotPlatform a bit and make the placeholder registry injectible 2020-12-05 18:41:41 +01:00
N0tMyFaultOG
60b5f5fe48
Add note about Nashorn 2020-12-05 18:38:10 +01:00
N0tMyFaultOG
34e02e9f3a
Make JavaVersionCheck private 2020-12-04 16:00:18 +01:00
N0tMyFaultOG
62690c2a53
Postpone java version during startup 2020-12-04 12:25:53 +01:00
N0tMyFaultOG
5d30e0854f
Add java version checker 2020-12-04 12:15:56 +01:00
dordsor21
ee7f683b76
Bump paperlib, fix single worlds. 2020-11-26 16:54:38 +00:00
Traks
585111ca38
Cancel boat placement on interactable blocks, fixes PS-175 (#2934) 
* Cancel boat placement on interactable blocks, fixes PS-175

* Keep boat protection for old game versions

Co-authored-by: NotMyFault <mc.cache@web.de>
 2020-11-24 16:32:35 +01:00
N0tMyFaultOG
81c72ee5d9 Finish up permissions 2020-11-02 21:03:46 +01:00
N0tMyFaultOG
fed7f89f96 Fix compiling 2020-11-02 11:58:07 +01:00
N0tMyFaultOG
aefa629509 Generify permissions thru Permission class 
- Fixed a few improper permissions
- Fixed a couple of typos
 2020-11-02 00:55:58 +01:00
dordsor21
ee9b2e8bf8
Just merge the whole thing. Merge branch 'v6' into features/v6/queue-features 
# Conflicts:
#	Core/src/main/resources/lang/messages_en.json
 2020-11-01 18:58:24 +00:00
Mariell Hoversholm
333493f351 adventure v4.1.0; project now compiles 2020-10-17 21:10:02 +01:00
dordsor21
a7a29eaf97
Correctly cancel notify tasks and add notifications to commands 2020-10-09 17:24:59 +01:00
dordsor21
a451d2d6f2
Fix the injection 2020-10-09 16:34:59 +01:00
dordsor21
914429ab4f
Merge branch 'v6' into features/v6/queue-features 
# Conflicts:
#	Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java
#	Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotManager.java
#	Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
 2020-10-09 15:23:09 +01:00
N0tMyFaultOG
bba499649b No need to point if PAPI is not in use 2020-10-08 20:56:33 +02:00
N0tMyFaultOG
f9cd54c445 Shift logger.info -> error when running in an outdated environment 2020-10-08 20:54:06 +02:00
N0tMyFaultOG
0d89125a8e Replace sys out with logger factory 2020-10-08 20:52:02 +02:00
Mariell Hoversholm
c3069a425d Format licence headers 2020-10-08 14:02:08 +02:00
Mariell Hoversholm
9b1dc7d42e She compiles! 2020-10-08 14:02:08 +02:00
N0tMyFaultOG
ec23fcdd75 Rewrite build scripts 
Co-Authored By: Mariell Hoversholm <proximyst@proximyst.com>
 2020-10-08 14:02:08 +02:00
dordsor21
544d57c720
Merge branch 'v5' into v6 
# Conflicts:
#	Bukkit/build.gradle
#	Bukkit/pom.xml
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/uuid/BungeePermsUUIDService.java
#	Core/src/main/java/com/plotsquared/core/PlotPlatform.java
#	Core/src/main/java/com/plotsquared/core/command/DebugPaste.java
#	Core/src/main/java/com/plotsquared/core/command/Grant.java
#	build.gradle
 2020-10-07 12:20:32 +01:00
N0tMyFaultOG
a210f523a5 Add more information to debugpaste 2020-10-04 18:19:29 +02:00
Aurora
56e6922279 Remove BungeePerms UUID fetcher 2020-10-04 13:26:56 +02:00
Hannes Greule
81d0bf6f04 Prevent blocks from getting waterlogged 
In some cases, the PlayerInteractEvent doesn't cancel right clicks on blocks that can be waterlogged
 2020-10-03 21:54:14 +02:00
dordsor21
2f5ce67154
add back setShouldAbortSpawn 2020-09-29 15:55:08 +01:00
dordsor21
89318be5f4
Apply e2f9b4245b to paper listener too 2020-09-29 15:53:23 +01:00