Upstream
/
PlotSquared
mirror of https://github.com/IntellectualSites/PlotSquared.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,001 Commits 19 Branches 64 Tags 93 MiB
Commit Graph

51 Commits

Author SHA1 Message Date
Alexander Brandes 3d5c694daa
chore: Comply with OSSRH licensing guidelines (#3684) 2022-06-15 20:17:17 +02:00
Hannes Greule dc5c80d812
clean up PlayerCommandPreprocess listener (#3557) 2022-04-01 19:30:37 +02:00
Jordan 5fc153d896
fix: PlayerInteractEvent does not necessarily interact with a block (#3463) 2022-01-22 17:25:41 +01:00
Alex 827f46566c
draft: Address false positives in code style issues (#3461) 
* chore: Address false positive code style issues

* chore: More work

* More work
 2022-01-20 12:39:40 +01:00
Jordan 0c76d08b10
Only send border area exit message once (#3418) 
Fixes #3335
 2022-01-05 21:21:37 +01:00
Jordan 9c474570c8
Fix: use portal corners to test for event cancellation as entity can be null (#3417) 
* Fix: use portal corners to test for event cancellation as entity can be null

* Remove duplicate flag check?

* Simplify to Set#of
 2022-01-05 21:21:25 +01:00
NotMyFault 25095f4546
chore: Welcome 2022 2022-01-02 22:22:19 +01:00
Alex 7551450cf9
fix: Send user-friendly message on join of denied plot (#3388) 
Also refactor local variable `now` to a more fitting name
 2021-12-26 23:28:50 +01:00
zombachu a93402e27b
fix: Standardize projectile permissions (#3374) 
* fix: Standardize projectile permissions

- Let all projectiles (not just splash potions) have a permissions check on throwing
- Fixes snowballs, eggs, etc. being able to be thrown when not added to the plot, etc.
- Fixes #2986 (splash potions only able being to be thrown when also added to the plot)
- Remove the specialized code for egg hatching as now eggs are cancelled entirely
- Remove the non-standard plots.projectile.unowned and plots.projectile.other permissions in favor of the standard admin ones

* docs: Add back deprecated projectile permissions

* docs: Update Core/src/main/java/com/plotsquared/core/permissions/Permission.java

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

Co-authored-by: Alex <mc.cache@web.de>
 2021-12-17 22:06:56 +01:00
zombachu 92f41f43c5
fix: Ignore the use flag for liquid placement/removal (#3375) 
Fixes #3069
 2021-12-17 21:52:15 +01:00
Alex 47ae79e123
Revert "refactor: Address MiniMessage deprecations (#3354)" (#3371) 
This reverts commit f086826942.
 2021-12-14 23:04:36 +01:00
Alex f086826942
refactor: Address MiniMessage deprecations (#3354) 
* refactor: Address MiniMessage deprecations

* refactor: More MiniMessage deprecations

* Move away from our `Templates#of`

* Address comments

* style: Address migration style issues

* docs: Add javadoc link for MiniMessage
 2021-12-13 09:48:34 +01:00
Alex 48c7a3e94e
refactor: Use player friendly done message on restricted building (#3309) 2021-11-02 13:32:04 +00:00
Jordan be85708e5a
feat: Add border bypass permission (#3302) 
* Add border bypass permission
 - Fixes #3297

* Add permission to plots.admin permpack

* Implement messages on leaving/entering border area

* Rename to border.denied and make border msg red

* change too le/ge as tthey are likely to be equal to border when hit.
 - Since we check for being across the border beforehand, it will hopefully not be spammed too much?
 - If it's spammed then either we use meta to set if a player's left the border, or we just remove the come-back-in altogether because it's a little looong
 2021-10-28 10:13:36 +02:00
NotMyFault b224a8d1b8
Include world in plot chat & spy template 2021-09-07 16:36:08 +02:00
NotMyFault 2988ad6b11
Address style violations 2021-08-18 11:58:18 +02:00
Traks a405611b3a
Fix emptying buckets in plot border (#3192) 
* Fix emptying buckets in plot border

* Note on 1.13 compatibility for bucket-empty event

Co-authored-by: NotMyFault <mc.cache@web.de>
 2021-08-03 21:03:53 +00:00
Aurélien 6ad51bba65
Hot-fix for IntellectualSites#3179 (#3188) 
Authored by @SirYwell ty!
 2021-07-28 12:42:20 +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 8e23b10f7c
Fix update notification ingame message 2021-06-27 18:11:57 +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
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 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 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
Alexander Söderberg 57fc51d013 Initial annotation usage cleanup + EditorConfig 2021-01-09 22:28:41 +01:00
N0tMyFaultOG e8642df674
Update licenses to 2021 
Happy new year 🎆
 2021-01-01 00:19:45 +01: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
Alexander Söderberg c8ad936d26
Clean up PlotPlatform a bit and make the placeholder registry injectible 2020-12-05 18:41:41 +01: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 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
Mariell Hoversholm 333493f351 adventure v4.1.0; project now compiles 2020-10-17 21:10:02 +01:00
Mariell Hoversholm c3069a425d Format licence headers 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
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
Hannes Greule 72507aba4b Change player locale on event 2020-08-17 00:29:53 +02:00
MeFisto94 61d1dcc231 Ignore Events if they are not caused by real players (i.e. citizens) 2020-08-16 14:09:32 +02:00
N0tMyFaultOG 4a220f9bfb Update license header 2020-08-15 14:59:29 +02:00
dordsor21 7bad242944
Merge branch 'v6' into feature/v6/json. It builds! 
# Conflicts:
#	Bukkit/build.gradle
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/inject/BukkitModule.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/queue/ChunkCoordinator.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
#	Core/src/main/java/com/plotsquared/core/PlotSquared.java
#	Core/src/main/java/com/plotsquared/core/command/Area.java
#	Core/src/main/java/com/plotsquared/core/command/Clear.java
#	Core/src/main/java/com/plotsquared/core/command/Debug.java
#	Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java
#	Core/src/main/java/com/plotsquared/core/command/Relight.java
#	Core/src/main/java/com/plotsquared/core/command/Set.java
#	Core/src/main/java/com/plotsquared/core/command/Template.java
#	Core/src/main/java/com/plotsquared/core/command/Trim.java
#	Core/src/main/java/com/plotsquared/core/components/ComponentPresetManager.java
#	Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java
#	Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java
#	Core/src/main/java/com/plotsquared/core/plot/Plot.java
#	Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java
#	Core/src/main/java/com/plotsquared/core/queue/AreaBoundDelegateQueueCoordinator.java
#	Core/src/main/java/com/plotsquared/core/queue/ChunkQueueCoordinator.java
#	Core/src/main/java/com/plotsquared/core/queue/LocalBlockQueue.java
#	Core/src/main/java/com/plotsquared/core/util/ChunkUtil.java
#	Core/src/main/java/com/plotsquared/core/util/EntityUtil.java
#	Core/src/main/java/com/plotsquared/core/util/RegionManager.java
#	Core/src/main/java/com/plotsquared/core/util/WorldUtil.java
#	Core/src/main/java/com/plotsquared/core/uuid/UUIDPipeline.java
#	build.gradle
 2020-08-08 13:20:30 +01:00
dordsor21 221d299052
Fix a few remaining merge issues (+1 squashed commits) 
Squashed commits:

[8c6b55dd4] Fix a few remaining merge issues
 2020-07-24 17:57:16 +01:00
dordsor21 57435fdf34
verbosely ensure items cannot be duplicated when keeping inventory on death 
Seemingly there's duplication issues on some servers (and apparently even when only PlotSquared is installed). Likely a Spigot issue, but there's nothing to be done for Spigot on 1.13/14/15
 2020-07-16 23:24:11 +01:00
N0tMyFaultOG 4996d8bcd1 Remove left over debugs 2020-07-15 14:05:15 +02:00