Commit Graph

  • 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 dordsor21 2020-07-16 23:24:11 +01:00
  • 01ff9a34c2 Merge branch 'features/v5/placeholders' into v5 N0tMyFaultOG 2020-07-16 18:48:45 +02:00
  • ff3a94933a Bump version N0tMyFaultOG 2020-07-16 18:43:52 +02:00
  • 97a356c4a0 Very attentive reviewers, can recommend Hannes Greule 2020-07-16 18:13:02 +02:00
  • 10ab28c1ec Add missing license headers Hannes Greule 2020-07-16 18:08:00 +02:00
  • 2d9cf8b759 Get placeholders working Hannes Greule 2020-07-16 18:04:17 +02:00
  • 32b28a4ca5 Turn all UUID messages into debug messages Alexander Söderberg 2020-07-15 22:42:58 +02:00
  • 4996d8bcd1 Remove left over debugs N0tMyFaultOG 2020-07-15 14:05:15 +02:00
  • e5963a8590 Merge pull request #2877 from IntellectualSites/features/v5/split-bukkit-listeners NotMyFault 2020-07-15 13:35:38 +02:00
  • e8c155763b Register placeholders N0tMyFaultOG 2020-07-15 12:44:07 +02:00
  • a52249513e Update MVdW version N0tMyFaultOG 2020-07-15 12:05:42 +02:00
  • 5d2d4ac12b fix language issue Alexander Söderberg 2020-07-14 20:47:15 +02:00
  • 64f5580edd Fix code styling issue Alexander Söderberg 2020-07-14 20:46:52 +02:00
  • b989531a60 Merge branch 'v5' into features/v5/placeholders Alexander Söderberg 2020-07-14 20:41:17 +02:00
  • 34655b8d41 Add (untested) MVdWPlaceholderAPI support Alexander Söderberg 2020-07-14 20:41:08 +02:00
  • 30327d2fa3 update bukkit pom dordsor21 2020-07-14 19:11:46 +01:00
  • 2e4c43c251 Add config option to disable placing top wall blocks dordsor21 2020-07-14 19:10:53 +01:00
  • c0a0d36e5d Remove remaining jetbrains imports Alexander Söderberg 2020-07-14 19:40:47 +02:00
  • b68d7150f1 Manually fix some merge conflicts Alexander Söderberg 2020-07-14 19:34:44 +02:00
  • 198bcfdf4d Merge branch 'v6' into feature/v6/json Alexander Söderberg 2020-07-14 19:25:14 +02:00
  • 8eb903ad72 Merge branch 'v5' into v6 Alexander Söderberg 2020-07-14 19:18:08 +02:00
  • c853147635 Merge pull request #2870 from IntellectualSites/feature/v6/platform Alexander Söderberg 2020-07-14 19:13:00 +02:00
  • 0294397021 Manually resolve a bunch of merge issues Alexander Söderberg 2020-07-14 19:10:52 +02:00
  • 97fed21811 Merge branch 'v6' into feature/v6/platform Alexander Söderberg 2020-07-14 19:05:05 +02:00
  • 510ea56431 Finalize DI stuff Alexander Söderberg 2020-07-14 18:49:40 +02:00
  • 7897d78f0d Merge pull request #2868 from IntellectualSites/feature/v6/slf4j Alexander Söderberg 2020-07-14 18:49:34 +02:00
  • 25a58a5c46 Merge branch 'v6' into feature/v6/platform Alexander Söderberg 2020-07-14 17:45:33 +02:00
  • f9e5fd714d Merge remote-tracking branch 'origin/feature/v6/platform' into feature/v6/platform Alexander Söderberg 2020-07-14 17:07:03 +02:00
  • 55eefd09da Merge branch 'v6' into feature/v6/json Alexander Söderberg 2020-07-14 16:52:40 +02:00
  • 0ce1f3e0f6 Send special message when caption cannot be found Alexander Söderberg 2020-07-14 16:36:13 +02:00
  • 99be181aea Migrate some more captions Alexander Söderberg 2020-07-14 16:31:58 +02:00
  • fbf6a3517d Add back title method that somehow went missing and add a template utility class to make templates less annoying to work with Alexander Söderberg 2020-07-14 15:04:31 +02:00
  • 1dc4da8beb Fix issues from previous merge Alexander Söderberg 2020-07-14 13:21:59 +02:00
  • 1908588fcb Change expansion author and version Alexander Söderberg 2020-07-14 13:17:21 +02:00
  • af7db08036 Add new placeholder system Alexander Söderberg 2020-07-14 13:14:02 +02:00
  • e72ce9c90e Update gradle.yml NotMyFault 2020-07-14 12:44:11 +02:00
  • 32264ae5e3 Update gradle.yml NotMyFault 2020-07-14 12:43:45 +02:00
  • 33f2ff7e6d Merge branch 'v6' into feature/v6/slf4j Alexander Söderberg 2020-07-13 23:11:40 +02:00
  • 6664d49928 Prefix all log messages Alexander Söderberg 2020-07-13 23:04:27 +02:00
  • d648a6d3db Merge remote-tracking branch 'origin/feature/v6/slf4j' into feature/v6/slf4j Alexander Söderberg 2020-07-13 22:52:10 +02:00
  • a1f262b5b2 Fix gradle setup and replace all debug calls Alexander Söderberg 2020-07-13 22:51:57 +02:00
  • b109b76120 Nevermind, it doesn't allow for relocations Alexander Söderberg 2020-07-13 20:50:49 +02:00
  • 1388f280e6 Update module poms N0tMyFaultOG 2020-07-13 20:46:34 +02:00
  • d141b040d6 Fix relocations Alexander Söderberg 2020-07-13 20:45:04 +02:00
  • e84d82315c Add log4j config (this might work :p) Alexander Söderberg 2020-07-13 20:39:52 +02:00
  • c6962ef4d2 Shift a few more messages to debug N0tMyFaultOG 2020-07-13 19:56:34 +02:00
  • f93714a44e Properly add prefixes to messages N0tMyFaultOG 2020-07-13 13:01:13 +02:00
  • 564efd77f7 Fix some messages Hannes Greule 2020-07-12 22:11:23 +02:00
  • 5442c7cc2e Start moving commands to new message system Hannes Greule 2020-07-12 22:05:56 +02:00
  • 0fa5a16cd0 replace remaining debug calls Alexander Söderberg 2020-07-12 21:49:05 +02:00
  • 1881cdc9ab Revert "Add prefix" N0tMyFaultOG 2020-07-12 21:28:38 +02:00
  • fb2aa44f78 Add prefix N0tMyFaultOG 2020-07-12 21:25:22 +02:00
  • e88da3cea9 Add chunk coordinator Alexander Söderberg 2020-07-12 14:43:57 +02:00
  • 14b6f84816 fix typos that were c/p over dordsor21 2020-07-12 18:50:04 +01:00
  • ac8841447c 6cf2c0ad97 (r40542418) N0tMyFaultOG 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 Alexander Söderberg 2020-07-12 17:04:30 +02:00
  • c045ef698c Add license headers and fix method change in PlotSquared.java dordsor21 2020-07-12 11:42:45 +01:00
  • 5cdb3f4fd5 Add missing injection points Alexander Söderberg 2020-07-12 12:25:44 +02:00
  • 5a5c5721cc fix compiler crashing Alexander Söderberg 2020-07-12 07:38:57 +02:00
  • 3a11ffc77a Clean up bukkit listeners by splitting them up dordsor21 2020-07-11 19:03:55 +01:00
  • 916675fb08 Guice progress Alexander Söderberg 2020-07-11 17:19:19 +02:00
  • a2ec404014 Fix /plot target nearest dordsor21 2020-07-11 13:40:22 +01:00
  • 6f6cb4b630 More DI progress Alexander Söderberg 2020-07-11 05:29:41 +02:00
  • c0f69f321d Guice progress Alexander Söderberg 2020-07-10 22:12:37 +02:00
  • 55bf41d2da Remove dumdum static access Alexander Söderberg 2020-07-10 19:25:05 +02:00
  • 7687d7705b Fix merge issue Alexander Söderberg 2020-07-10 18:38:14 +02:00
  • 21ad9a36c8 Merge branch 'v6' into feature/v6/platform Alexander Söderberg 2020-07-10 18:37:18 +02:00
  • afb72aa102 Don't include eggs with spawn*_eggs* dordsor21 2020-07-10 17:31:46 +01:00
  • d00dc658df Inject EventDispatcher and PlotListener Alexander Söderberg 2020-07-10 18:17:44 +02:00
  • 2dab7c8dda Inject PlotAreaManager Alexander Söderberg 2020-07-10 17:32:07 +02:00
  • c37cc40ad9 Move annotation in BukkitWorld Alexander Söderberg 2020-07-10 12:27:26 +02:00
  • 5341015cb1 Finalize immutable locations and add a platform world implementation Alexander Söderberg 2020-07-10 12:21:29 +02:00
  • 2fb76e6636 Split road and plot paste-on-top settings dordsor21 2020-07-09 22:39:06 +01:00
  • 5b260ea8da update bukkit pom dordsor21 2020-07-09 22:33:01 +01:00
  • 55139eb134 Do not respect paste on top for road schematics. dordsor21 2020-07-09 22:19:23 +01:00
  • 5e44bb60c6 Merge branch 'v5' of github.com:IntellectualSites/PlotSquared into v5 dordsor21 2020-07-09 22:14:38 +01:00
  • 96740fd282 Couple of fixes to road flag logic dordsor21 2020-07-09 21:52:51 +01:00
  • cf1b027db9 Start making locations immutable Alexander Söderberg 2020-07-09 22:28:46 +02:00
  • fb050ac3da 5.12.5 NotMyFault 2020-07-09 21:15:28 +02:00
  • b36c6427d1 Split failed UUID batches into individual requests in order to identify the invalid UUIDs Alexander Söderberg 2020-07-09 20:25:16 +02:00
  • 63c308971b Update location block vector on add and subtract Traks 2020-07-09 18:31:44 +02:00
  • cfd389883b Improve piston interaction with area border Traks 2020-07-09 18:30:45 +02:00
  • 4576cfd961 Improve piston interaction with plot border Traks 2020-07-09 15:43:16 +02:00
  • 89cb6450fb Fix issue where PlotPlayer#getLocation returns a mutable location Alexander Söderberg 2020-07-09 20:04:00 +02:00
  • 699eb71e2a Fix kill-road-mobs. Fixes PS-73 Alexander Söderberg 2020-07-09 19:46:17 +02:00
  • 6b07f38cff Send teleportation cancellation message immediately on movement, rather than after the timer has finished. This fixes PS-33. Alexander Söderberg 2020-07-09 16:45:25 +02:00
  • 904f5485ab Merge remote-tracking branch 'origin/v5' into v5 Alexander Söderberg 2020-07-09 16:38:53 +02:00
  • e05d817482 Fix plot owner placeholder. Fixes PS-62. Alexander Söderberg 2020-07-09 16:38:46 +02:00
  • db37077af7 Make signs able to use captions Alexander Söderberg 2020-07-09 12:58:28 +02:00
  • 61de18190f More dispense blocking on roads Traks 2020-07-09 02:11:51 +02:00
  • 1310f9470e 5.12.4 dordsor21 2020-07-08 19:34:08 +01:00
  • d652225f36 Let players teleport to their merged plots Hannes Greule 2020-07-08 19:33:58 +02:00
  • 2936b806f3 Allow players to interact on their own plot dordsor21 2020-07-08 17:10:09 +01:00
  • 3fa532a3c0 Move message sending into PlotPlayer to make it platform independent Alexander Söderberg 2020-07-08 15:35:58 +02:00
  • d267d1bb98 Start expiry tasks dordsor21 2020-07-08 14:35:46 +01:00
  • 9792d4cc4b Remove style.yml Alexander Söderberg 2020-07-08 15:23:33 +02:00
  • 090bd69be5 Merge branch 'v6' into feature/v6/json Alexander Söderberg 2020-07-08 15:22:02 +02:00
  • c36e311520 Continue cleaning up PlotSquared.java Alexander Söderberg 2020-07-08 15:09:25 +02:00
  • f2191cb731 Save style.yml again Alexander Söderberg 2020-07-08 13:43:16 +02:00
  • 265c10ec1c Remove commands.yml Alexander Söderberg 2020-07-08 13:40:55 +02:00