NotMyFault
9fd11fbe13
Merge pull request #2893 from JunTVDE/de-translation-edit
...
added german translation for flag-descriptions to de-DE.yml
2020-08-09 13:21:31 +02:00
NotMyFault
7cd9a03b0f
Merge pull request #2894 from TimonMi/patch-1
...
Update link for contributing
2020-08-09 13:20:17 +02:00
EinDev
f8bd844c6c
Update link for contributing
2020-08-09 13:18:35 +02:00
JunTVDE
987d9a267c
added german translation for flag-descriptions to de-DE.yml
2020-08-09 13:05:40 +02:00
EinDev
98d1bb9264
Merge remote-tracking branch 'upstream/v5' into v5
2020-08-08 18:39:47 +02:00
EinDev
b46a19f5ca
Keep player names, so they don't have to be looked up again.
...
That way the lookup function MainUtil#getName won't get called which would throw an exception if called in the Bukkit Thread.
As the player enters the Name, we don't have to look it up again.
Fixes PS-96
2020-08-08 18:07:49 +02:00
dordsor21
6e16ef1246
remove PllayerEvents
2020-08-08 13:21:46 +01: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
74a5c48214
Finish up core and bukkit json
2020-08-08 12:16:48 +01:00
N0tMyFaultOG
11af906c79
Fix a little oopsie
2020-08-07 18:55:22 +02:00
N0tMyFaultOG
c31c4b4286
More work
2020-08-07 18:52:45 +02:00
dordsor21
7f29b5d1e8
ComponentPreset inventory to json
2020-08-07 13:22:10 +01:00
dordsor21
6012705e95
Implement Permission#format to replace the CaptionUtility#format method
2020-08-07 12:12:16 +01:00
dordsor21
21a97863ac
Refactor Captions to Permission, reimplement message list in debug command
2020-08-07 11:53:32 +01:00
dordsor21
50cfecb3fd
Several minor progress. Couple of bigger (inboxes and help)
2020-08-07 11:08:03 +01:00
dordsor21
1461804039
Remove last reference to PlotMessage in Core
2020-08-07 10:20:11 +01:00
Timon
dc3f45acd4
Added UseFlag check at Roads
2020-08-07 09:57:02 +01:00
Hannes Greule
6970dfa5f8
More json progress
2020-08-07 02:53:05 +02:00
MeFisto94
48d3c2105d
Fixes an OfflinePlayerUtil breakage caused by NMS Changes
2020-08-06 15:23:36 +02:00
dordsor21
18f630ba15
Bit more json
2020-08-06 14:06:19 +01:00
dordsor21
f68eb9c778
update plot list
2020-08-06 13:36:15 +01:00
dordsor21
4a960d9f2c
update pagination to new json
2020-08-06 12:23:47 +01:00
Timon
c745b99922
Added UseFlag check at Roads
2020-08-06 12:01:43 +02:00
dordsor21
f1e3902fea
Several more progress
2020-08-05 11:48:10 +01:00
N0tMyFaultOG
41a623a643
More work towards json
2020-08-04 19:01:25 +02:00
dordsor21
d3fe1d3b2b
Fix plot info, sign usage in Plot.class
2020-08-04 15:07:07 +01:00
Hannes Greule
3fd3baaa47
Making progress on messages
2020-08-03 23:59:16 +02:00
N0tMyFaultOG
01d2b0024f
Add more information to the debugpaste
2020-07-31 20:33:17 +02:00
N0tMyFaultOG
01e66f8833
Readd skyblock template
2020-07-29 14:53:09 +02:00
dordsor21
afd9b56e71
Merge branch 'v5' of github.com:IntellectualSites/PlotSquared into v5
2020-07-28 13:58:37 +01:00
dordsor21
e2f9b4245b
Fixes https://issues.intellectualsites.com/issue/PS-81
...
- Add break statements to switches to prevent bleed from normal spawning to breeding
- Separate misc spawning from mob spawning
2020-07-28 13:56:37 +01:00
N0tMyFaultOG
22a007b514
Revert "Update zh-CN.yml"
...
This reverts commit 240362a16d
2020-07-28 12:33:04 +02:00
dordsor21
38988b4819
A little spring cleaning
...
- Add Javadoc comments for where QueueCoordinator can be given or nulled
- Add some more Javadoc comments in general
- Squash methods into one where QueueCoordinator can be given
- Only use one queue in some places where it makes sense
2020-07-28 10:18:49 +01:00
dordsor21
704e92c3d0
Use placeholder
2020-07-28 09:38:27 +01:00
dordsor21
97b1a60ae8
Move comments to ChunkCoordinator, remove Range annotations
2020-07-28 08:44:16 +01:00
dordsor21
3288721259
Better constructor error handling in QueueProvider.
...
Add back default constructor requiring world to QueueCoordinator to indicate extents require this constructor
2020-07-28 08:34:14 +01:00
N0tMyFaultOG
ab121c7eee
Fixes https://github.com/IntellectualSites/PlotSquaredSuggestions/issues/133
2020-07-26 21:12:32 +02:00
NotMyFault
240362a16d
Update zh-CN.yml
2020-07-26 17:08:58 +02:00
Alexander Söderberg
f2dcbce490
Fix problem where servers created in v5 (not converted from v4) would fail to start properly.
...
This is a quite major issue and I hope this fix resolves it. Although, it should be tested with migration from v4 to v5 and then a fresh v5 server.
2020-07-25 03:16:36 +02:00
Alexander Söderberg
88df434404
Create CODE_OF_CONDUCT.md
2020-07-25 03:11:07 +02:00
dordsor21
b3ddabda29
Fix DelegateQueueCoordinator
2020-07-24 18:20:26 +01:00
dordsor21
b8b3e1e72a
Merge branch 'v6' into feature/v6/pipeline-queue
...
# Conflicts:
# Bukkit/build.gradle
# Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java
2020-07-24 18:18:42 +01:00
dordsor21
615a5212bf
update bukkit pom
2020-07-24 17:57:16 +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
3180d2ddf2
Merge branch 'v5' into v6
...
# Conflicts:
# Bukkit/build.gradle
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
# Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/Placeholders.java
# 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/generator/ClassicPlotManager.java
# Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java
# Core/src/main/java/com/plotsquared/core/uuid/UUIDPipeline.java
# build.gradle
2020-07-24 17:15:58 +01:00
dordsor21
7aaa075ba8
Javadoc, some cleanup
2020-07-24 17:00:08 +01:00
Alexander Söderberg
4fb590889a
Remove all permission related errors
2020-07-24 17:44:47 +02:00
Alexander Söderberg
115ca903b2
Remove unused stuff
2020-07-24 17:36:48 +02:00
Alexander Söderberg
e90170a384
Merge remote-tracking branch 'origin/v6' into feature/v6/json
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
# Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java
# Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
# Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitLocalQueue.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java
# Core/pom.xml
# Core/src/main/java/com/plotsquared/core/PlotAPI.java
# 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/Area.java
# Core/src/main/java/com/plotsquared/core/command/Auto.java
# Core/src/main/java/com/plotsquared/core/command/Claim.java
# Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java
# Core/src/main/java/com/plotsquared/core/command/Command.java
# Core/src/main/java/com/plotsquared/core/command/CommandCaller.java
# Core/src/main/java/com/plotsquared/core/command/DebugExec.java
# Core/src/main/java/com/plotsquared/core/command/Grant.java
# Core/src/main/java/com/plotsquared/core/command/Inbox.java
# Core/src/main/java/com/plotsquared/core/command/Load.java
# Core/src/main/java/com/plotsquared/core/command/Save.java
# Core/src/main/java/com/plotsquared/core/command/Setup.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/Plot.java
# Core/src/main/java/com/plotsquared/core/plot/comment/CommentManager.java
# Core/src/main/java/com/plotsquared/core/util/BlockUtil.java
# Core/src/main/java/com/plotsquared/core/util/Permissions.java
2020-07-24 17:28:52 +02:00
dordsor21
1d0760c630
Formatting, mark nonnull, nullable etc
2020-07-24 16:24:53 +01:00
