EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-11-04 11:13:45 +01:00
Code Issues Projects Releases Wiki Activity
4,288 Commits 282 Branches 83 Tags
29b92659c7143ac17ae70088761386dd4e77cb7f
Commit Graph

4288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Söderberg
33f2ff7e6d Merge branch 'v6' into feature/v6/slf4j 2020-07-13 23:11:40 +02:00
Alexander Söderberg
6664d49928 Prefix all log messages 2020-07-13 23:04:27 +02:00
Alexander Söderberg
d648a6d3db Merge remote-tracking branch 'origin/feature/v6/slf4j' into feature/v6/slf4j 
# Conflicts:
#	Bukkit/pom.xml
#	Core/pom.xml
 2020-07-13 22:52:10 +02:00
Alexander Söderberg
a1f262b5b2 Fix gradle setup and replace all debug calls 2020-07-13 22:51:57 +02:00
Alexander Söderberg
b109b76120 Nevermind, it doesn't allow for relocations 2020-07-13 20:50:49 +02:00
N0tMyFaultOG
1388f280e6 Update module poms 2020-07-13 20:46:34 +02:00
Alexander Söderberg
d141b040d6 Fix relocations 2020-07-13 20:45:04 +02:00
Alexander Söderberg
e84d82315c Add log4j config (this might work :p) 2020-07-13 20:39:52 +02:00
N0tMyFaultOG
c6962ef4d2 Shift a few more messages to debug 2020-07-13 19:56:34 +02:00
N0tMyFaultOG
f93714a44e Properly add prefixes to messages 2020-07-13 13:01:13 +02:00
Hannes Greule
564efd77f7 Fix some messages 2020-07-12 22:11:23 +02:00
Hannes Greule
5442c7cc2e Start moving commands to new message system 2020-07-12 22:06:07 +02:00
Alexander Söderberg
0fa5a16cd0 replace remaining debug calls 2020-07-12 21:49:05 +02:00
N0tMyFaultOG
1881cdc9ab Revert "Add prefix" 
This reverts commit fb2aa44f78.
 2020-07-12 21:28:38 +02:00
N0tMyFaultOG
fb2aa44f78 Add prefix 2020-07-12 21:25:22 +02:00
Alexander Söderberg
e88da3cea9 Add chunk coordinator 2020-07-12 20:58:48 +02:00
dordsor21
14b6f84816 fix typos that were c/p over 2020-07-12 18:50:04 +01:00
N0tMyFaultOG
ac8841447c 6cf2c0ad97 (r40542418) 2020-07-12 17:11:25 +02:00
Alexander Söderberg
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
dordsor21
c045ef698c Add license headers and fix method change in PlotSquared.java 2020-07-12 11:42:45 +01:00
Alexander Söderberg
5cdb3f4fd5 Add missing injection points 2020-07-12 12:25:44 +02:00
Alexander Söderberg
5a5c5721cc fix compiler crashing 2020-07-12 07:38:57 +02:00
dordsor21
3a11ffc77a Clean up bukkit listeners by splitting them up 2020-07-11 19:03:55 +01:00
Alexander Söderberg
916675fb08 Guice progress 2020-07-11 17:19:19 +02:00
dordsor21
a2ec404014 Fix /plot target nearest 2020-07-11 13:40:22 +01:00
Alexander Söderberg
6f6cb4b630 More DI progress 2020-07-11 05:29:41 +02:00
Alexander Söderberg
c0f69f321d Guice progress 2020-07-10 22:12:37 +02:00
Alexander Söderberg
55bf41d2da Remove dumdum static access 2020-07-10 19:25:05 +02:00
Alexander Söderberg
7687d7705b Fix merge issue 2020-07-10 18:38:14 +02:00
Alexander Söderberg
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
dordsor21
afb72aa102 Don't include eggs with spawn*_eggs* 2020-07-10 17:31:46 +01:00
Alexander Söderberg
d00dc658df Inject EventDispatcher and PlotListener 2020-07-10 18:17:44 +02:00
Alexander Söderberg
2dab7c8dda Inject PlotAreaManager 2020-07-10 17:32:07 +02:00
Alexander Söderberg
c37cc40ad9 Move annotation in BukkitWorld 2020-07-10 12:27:26 +02:00
Alexander Söderberg
5341015cb1 Finalize immutable locations and add a platform world implementation 2020-07-10 12:21:29 +02:00
dordsor21
2fb76e6636 Split road and plot paste-on-top settings 2020-07-09 22:39:06 +01:00
dordsor21
5b260ea8da update bukkit pom 2020-07-09 22:33:01 +01:00
dordsor21
55139eb134 Do not respect paste on top for road schematics. 2020-07-09 22:19:23 +01:00
dordsor21
5e44bb60c6 Merge branch 'v5' of github.com:IntellectualSites/PlotSquared into v5 2020-07-09 22:14:38 +01:00
dordsor21
96740fd282 Couple of fixes to road flag logic 2020-07-09 21:52:51 +01:00
Alexander Söderberg
cf1b027db9 Start making locations immutable 2020-07-09 22:28:46 +02:00
NotMyFault
fb050ac3da 5.12.5 2020-07-09 21:15:28 +02:00
Alexander Söderberg
b36c6427d1 Split failed UUID batches into individual requests in order to identify the invalid UUIDs 2020-07-09 20:37:14 +02:00
Traks
63c308971b Update location block vector on add and subtract 2020-07-09 20:14:06 +02:00
Traks
cfd389883b Improve piston interaction with area border 2020-07-09 20:14:06 +02:00
Traks
4576cfd961 Improve piston interaction with plot border 
Fixes retracting pistons being able to modify plot borders. Prevents
piston heads from sticking outside plots.
 2020-07-09 20:14:06 +02:00
Alexander Söderberg
89cb6450fb Fix issue where PlotPlayer#getLocation returns a mutable location 2020-07-09 20:04:00 +02:00
Alexander Söderberg
699eb71e2a Fix kill-road-mobs. Fixes PS-73 2020-07-09 19:46:17 +02:00
Alexander Söderberg
6b07f38cff Send teleportation cancellation message immediately on movement, rather than after the timer has finished. This fixes PS-33. 2020-07-09 16:45:25 +02:00
Alexander Söderberg
904f5485ab Merge remote-tracking branch 'origin/v5' into v5 2020-07-09 16:38:53 +02:00