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
01ff9a34c2
Merge branch 'features/v5/placeholders' into v5
2020-07-16 18:48:45 +02:00
ff3a94933a
Bump version
2020-07-16 18:43:52 +02:00
97a356c4a0
Very attentive reviewers, can recommend
2020-07-16 18:13:02 +02:00
10ab28c1ec
Add missing license headers
2020-07-16 18:08:00 +02:00
2d9cf8b759
Get placeholders working
2020-07-16 18:04:17 +02:00
4996d8bcd1
Remove left over debugs
2020-07-15 14:05:15 +02:00
e5963a8590
Merge pull request #2877 from IntellectualSites/features/v5/split-bukkit-listeners
...
Clean up bukkit listeners by splitting them up
2020-07-15 13:35:38 +02:00
e8c155763b
Register placeholders
2020-07-15 12:44:07 +02:00
a52249513e
Update MVdW version
2020-07-15 12:05:42 +02:00
34655b8d41
Add (untested) MVdWPlaceholderAPI support
2020-07-14 20:41:08 +02:00
30327d2fa3
update bukkit pom
2020-07-14 19:11:46 +01:00
c0a0d36e5d
Remove remaining jetbrains imports
2020-07-14 19:40:47 +02:00
b68d7150f1
Manually fix some merge conflicts
2020-07-14 19:34:44 +02:00
198bcfdf4d
Merge branch 'v6' into feature/v6/json
...
# Conflicts:
# Bukkit/build.gradle
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
# Core/build.gradle
# Core/src/main/java/com/plotsquared/core/PlotPlatform.java
# Core/src/main/java/com/plotsquared/core/PlotSquared.java
# Core/src/main/java/com/plotsquared/core/command/Add.java
# Core/src/main/java/com/plotsquared/core/command/Area.java
# Core/src/main/java/com/plotsquared/core/command/Auto.java
# Core/src/main/java/com/plotsquared/core/command/Command.java
# Core/src/main/java/com/plotsquared/core/command/ListCmd.java
# Core/src/main/java/com/plotsquared/core/configuration/Caption.java
# Core/src/main/java/com/plotsquared/core/listener/PlotListener.java
# Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java
# Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java
# Core/src/main/java/com/plotsquared/core/plot/message/PlotMessage.java
# Core/src/main/java/com/plotsquared/core/setup/CommonSetupSteps.java
# Core/src/main/java/com/plotsquared/core/util/MainUtil.java
# Core/src/main/java/com/plotsquared/core/util/WorldUtil.java
2020-07-14 19:25:14 +02:00
8eb903ad72
Merge branch 'v5' into v6
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
2020-07-14 19:18:08 +02:00
0294397021
Manually resolve a bunch of merge issues
2020-07-14 19:10:52 +02:00
97fed21811
Merge branch 'v6' into feature/v6/platform
...
# Conflicts:
# Bukkit/build.gradle
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitRegionManager.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
# Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SquirrelIdUUIDService.java
# Core/build.gradle
# Core/src/main/java/com/plotsquared/core/PlotSquared.java
# Core/src/main/java/com/plotsquared/core/command/Claim.java
# Core/src/main/java/com/plotsquared/core/command/Debug.java
# Core/src/main/java/com/plotsquared/core/command/DebugExec.java
# Core/src/main/java/com/plotsquared/core/command/Purge.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/database/SQLManager.java
# Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java
# Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java
# Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java
# Core/src/main/java/com/plotsquared/core/generator/SquarePlotWorld.java
# Core/src/main/java/com/plotsquared/core/listener/ProcessedWEExtent.java
# Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java
# Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java
# Core/src/main/java/com/plotsquared/core/plot/Plot.java
# Core/src/main/java/com/plotsquared/core/plot/PlotArea.java
# Core/src/main/java/com/plotsquared/core/plot/PlotInventory.java
# Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java
# Core/src/main/java/com/plotsquared/core/plot/expiration/PlotAnalysis.java
# Core/src/main/java/com/plotsquared/core/plot/flag/FlagContainer.java
# Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeWrapper.java
# Core/src/main/java/com/plotsquared/core/plot/message/PlotMessage.java
# Core/src/main/java/com/plotsquared/core/util/LegacyConverter.java
# Core/src/main/java/com/plotsquared/core/util/MainUtil.java
# Core/src/main/java/com/plotsquared/core/util/RegionManager.java
# Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
# Core/src/main/java/com/plotsquared/core/uuid/UUIDPipeline.java
2020-07-14 19:05:05 +02:00
510ea56431
Finalize DI stuff
2020-07-14 18:49:40 +02:00
55eefd09da
Merge branch 'v6' into feature/v6/json
2020-07-14 16:52:40 +02:00
1dc4da8beb
Fix issues from previous merge
2020-07-14 13:21:59 +02:00
1908588fcb
Change expansion author and version
2020-07-14 13:17:21 +02:00
af7db08036
Add new placeholder system
2020-07-14 13:14:02 +02:00
33f2ff7e6d
Merge branch 'v6' into feature/v6/slf4j
2020-07-13 23:11:40 +02:00
6664d49928
Prefix all log messages
2020-07-13 23:04:27 +02:00
a1f262b5b2
Fix gradle setup and replace all debug calls
2020-07-13 22:51:57 +02:00
b109b76120
Nevermind, it doesn't allow for relocations
2020-07-13 20:50:49 +02:00
d141b040d6
Fix relocations
2020-07-13 20:45:04 +02:00
e84d82315c
Add log4j config (this might work :p)
2020-07-13 20:39:52 +02:00
c6962ef4d2
Shift a few more messages to debug
2020-07-13 19:56:34 +02:00
0fa5a16cd0
replace remaining debug calls
2020-07-12 21:49:05 +02:00
e88da3cea9
Add chunk coordinator
2020-07-12 20:58:48 +02:00
14b6f84816
fix typos that were c/p over
2020-07-12 18:50:04 +01:00
ac8841447c
6cf2c0ad97 (r40542418)
2020-07-12 17:11:25 +02:00
6cf2c0ad97
Disable the paper uuid service for offline mode servers and add toggles for all third party uuid services
2020-07-12 17:04:30 +02:00
c045ef698c
Add license headers and fix method change in PlotSquared.java
2020-07-12 11:42:45 +01:00
5cdb3f4fd5
Add missing injection points
2020-07-12 12:25:44 +02:00
3a11ffc77a
Clean up bukkit listeners by splitting them up
2020-07-11 19:03:55 +01:00
916675fb08
Guice progress
2020-07-11 17:19:19 +02:00
6f6cb4b630
More DI progress
2020-07-11 05:29:41 +02:00
c0f69f321d
Guice progress
2020-07-10 22:12:37 +02:00
55bf41d2da
Remove dumdum static access
2020-07-10 19:25:05 +02:00
21ad9a36c8
Merge branch 'v6' into feature/v6/platform
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
# Core/src/main/java/com/plotsquared/core/PlotSquared.java
# Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java
# Core/src/main/java/com/plotsquared/core/location/Location.java
2020-07-10 18:37:18 +02:00
afb72aa102
Don't include eggs with spawn*_eggs*
2020-07-10 17:31:46 +01:00
d00dc658df
Inject EventDispatcher and PlotListener
2020-07-10 18:17:44 +02:00
2dab7c8dda
Inject PlotAreaManager
2020-07-10 17:32:07 +02:00
c37cc40ad9
Move annotation in BukkitWorld
2020-07-10 12:27:26 +02:00
5341015cb1
Finalize immutable locations and add a platform world implementation
2020-07-10 12:21:29 +02:00
5b260ea8da
update bukkit pom
2020-07-09 22:33:01 +01:00
5e44bb60c6
Merge branch 'v5' of github.com:IntellectualSites/PlotSquared into v5
2020-07-09 22:14:38 +01:00
