dordsor21
8c52e20736
Use BaseBlocks in regenallroads and minor cleanup of HybridUtils.
...
Fixes #2210
2018-12-31 16:08:09 +00:00
dordsor21
750be6c5fe
clean merge up
2018-12-28 17:03:00 +00:00
Rick Strafy
6292bff7c9
Fix rotation ( #2200 )
...
* Fix rotation
* Clean up some events and utility classes. Try to use as general type
declarations as possible. Add configurable override for the unsafe block checker.
* Treat tridents as a projectile
* Fix rotation and merged with current breaking branch
2018-12-28 09:42:03 +00:00
Sauilitired
12b8ae3eed
Clean up some events and utility classes. Try to use as general type
...
declarations as possible. Add configurable override for the unsafe block checker.
2018-12-28 07:39:39 +01:00
dordsor21
660754511b
Fix rotation of road schematics
2018-12-28 00:47:48 +00:00
dordsor21
2846363a2c
Revert "Use our own schematic readers in only create one input stream, and allow for future customisation of schematics if required/wanted."
...
This reverts commit 3521b8aa22
2018-12-27 20:06:02 +00:00
dordsor21
3521b8aa22
Use our own schematic readers in only create one input stream, and allow for future customisation of schematics if required/wanted.
2018-12-27 19:42:56 +00:00
Sauilitired
249b5d4068
Revert dors commit
2018-12-27 17:29:35 +01:00
Sauilitired
76113cb0ab
Allow specifying Y value for default plot home
2018-12-27 16:18:54 +01:00
matt
a529518b91
Minor changes, formatting, comments.
...
One notable thing added was the inclusion of more of the new mobs in one of the events.
2018-12-27 00:46:32 -05:00
Alexander Söderberg
75bcd1adec
Update StringMan.java
2018-12-27 01:31:48 +01:00
dordsor21
fba7eac6d8
Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking
2018-12-26 21:18:38 +00:00
dordsor21
6e127db982
Cleanup
2018-12-26 21:18:22 +00:00
Sauilitired
f1cf541606
Merge remote-tracking branch 'origin/breaking' into breaking
2018-12-26 19:16:42 +01:00
Sauilitired
2b9fe5afda
Fix plot music (and plot inventories)
2018-12-26 19:16:34 +01:00
dordsor21
ba47a21971
- Update code style to format annotations nicely
...
- Reformat code
2018-12-26 17:21:06 +00:00
dordsor21
8cb2bdc846
Nice code to handle schematic loading and remove the ability to debugroadregen a specific chunk, as it uses a completely different method to actual road generation.
2018-12-26 16:44:39 +00:00
Sauilitired
b05316c000
Recommend paper just like FAWE. I want to be like the cool kids.
...
Oh, and fix an issue with `/plot music`. Still broken. Just not
the same kind of broken.
2018-12-26 15:29:39 +01:00
Sauilitired
f1378013c1
Fix plot home
2018-12-26 01:39:49 +01:00
Sauilitired
edc758334c
Actually copy over the files as well...
2018-12-25 18:30:42 +01:00
Sauilitired
beb0f5708f
Whoops...
2018-12-25 18:28:07 +01:00
Sauilitired
71baee063c
Update maven info for Core
2018-12-25 18:27:07 +01:00
dordsor21
c14b76b324
Fix rotational blocks in road generation
2018-12-24 23:14:13 +00:00
dordsor21
af23d3d98e
Fix schematic pasting to paste tile entities and blocks with BlockData (e.g. stairs) properly
2018-12-24 17:56:13 +00:00
Sauilitired
9fe9c2662b
Fix legacy conversion of block lists
2018-12-24 08:57:17 +01:00
Sauilitired
9e0c226632
Fix schematic pasting
2018-12-24 08:13:15 +01:00
Sauilitired
4f43788307
Merge remote-tracking branch 'origin/breaking' into breaking
2018-12-24 01:50:45 +01:00
Sauilitired
8dae2555db
Make mv create work again
2018-12-24 01:50:17 +01:00
dordsor21
1bf621fb4b
Fix schematic saving (and improve performance slightly)
2018-12-23 22:49:43 +00:00
Sauilitired
2ede77318a
Add dordsor21 to author list
2018-12-23 20:32:48 +01:00
Sauilitired
5c678e86bb
Fix configuration loading issues
2018-12-23 20:31:29 +01:00
Sauilitired
02937cc543
Add configuration conversion and fix BukkitLegacyMappings
2018-12-23 19:43:36 +01:00
Sauilitired
165cac8b13
Fix bStats problem and commit Setup progress
2018-12-23 17:38:27 +01:00
Sauilitired
7900a95b25
Implement LegacyConverter
2018-12-21 22:55:47 +01:00
Sauilitired
fe12d03916
Remove unused classes.
2018-12-21 21:28:33 +01:00
dordsor21
886081e27f
The local build was a fluke, and I couldn't work it out in the last 3 hours, so here are some basic updates/cleanup to a few things, and an updated bui;d command in README.md
2018-12-21 16:26:19 +00:00
dordsor21
e757c3e13c
Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking
2018-12-21 13:39:27 +00:00
dordsor21
5fdb60f85d
Default plot height is at sea level (62)
2018-12-21 13:39:20 +00:00
dordsor21
aaed3f622a
Fix build for gradlew clean assemble build
2018-12-21 13:38:28 +00:00
sauilitired
130274de86
Fix multiverse setup and don't allow unsafe blocks in setup
2018-12-21 03:31:08 +01:00
dordsor21
28f3be56b3
Fix schematic creation
...
Seems fairly ugly, but only because the format requires the blocks be inputted in that exact order, and it prevents us from having to cache the blocks per chunk to then insert into the relevant tags.
2018-12-21 00:49:15 +00:00
dordsor21
c53cd1ec91
oops
2018-12-20 23:34:55 +00:00
dordsor21
90682e9f8b
Various:
...
- Some minor cleanup
- Test for null id, not for null PlotBlock
- Small fixes to schematic saving (still broken)
2018-12-20 23:33:24 +00:00
sauilitired
341e386df8
Delete Collection getBlocks to Array getBlocks
2018-12-20 21:46:00 +01:00
sauilitired
f4140ae728
Add getBlockArray() method
2018-12-20 21:40:50 +01:00
dordsor21
4e10682748
A few minor fixes
2018-12-20 18:46:52 +00:00
sauilitired
096ad1febe
Make sure that blocks are actually compiled. Whoopsie 🐮
2018-12-20 19:35:02 +01:00
dordsor21
1543ac50cd
Various:
...
- Empty StringPlotBlocks are air
- Update signs to 1.13
- Fix getting material in BukktiLocalQueue#setMaterial
2018-12-20 17:20:13 +00:00
sauilitired
568b4c8e85
Merge remote-tracking branch 'origin/breaking' into breaking
...
# Conflicts:
# Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
# Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
2018-12-20 02:25:55 +01:00
sauilitired
e939b8237e
Changelist:
...
- Added aliases for custom configuration types
- Removed numerical ID based methods in Block Queues
- Fixed sign removal in Plot.java
- (Hopefully) fixed dividing by 0 errors in BlockBucket
- Removed random from some methods, as blockbucket has it's own random
- Temporarily removed chunk analysis
- Changed a lot in GenChunk and BukkitPlotGenerator
2018-12-20 02:23:48 +01:00
dordsor21
cbc2b70336
Merge commit 'be485075993f8dc807595c524f58c3bb58156a0c' into breaking
...
# Conflicts:
# README.md
2018-12-20 00:55:44 +00:00
dordsor21
11ccfe7ac4
Reformat code
2018-12-19 23:26:20 +00:00
dordsor21
fa2dbb2b89
Update to WorldEdit 7 (and WE7-compatible schematics, *hopefully keeping legacy*)
2018-12-19 23:18:57 +00:00
sauilitired
e724aa8caf
Fix PlotItem.
2018-12-19 18:24:35 +01:00
sauilitired
8f23299e7d
Use BlockBuckets everywhere.
2018-12-19 17:19:54 +01:00
dordsor21
361cc9e9f7
Remove old LegacyMappings class from Bukkit
...
Add "fromAny" method
2018-12-19 15:08:49 +00:00
dordsor21
531d8cc706
Merge branch 'breaking' into breaking
2018-12-19 14:54:32 +00:00
dordsor21
4b02bb1df8
Refactor legacy mappings to use PlotBlocks
2018-12-19 14:52:15 +00:00
sauilitired
1d3270d869
BlockBuckets r cool 🐮
2018-12-19 00:01:13 +01:00
sauilitired
af9418552a
Whoops.
2018-12-18 20:58:52 +01:00
sauilitired
10b87f5728
Add mappings for pre initialized items
2018-12-18 20:56:55 +01:00
sauilitired
ccad0bced9
Progress.
2018-12-18 20:54:20 +01:00
sauilitired
fb7bcef05f
1.13 shizzle
2018-12-17 20:57:21 +01:00
NotMyFault
8ad75efa0e
Adding French translation
2018-12-12 16:12:40 +01:00
sauilitired
820710721e
Schematic list command
2018-12-06 18:01:33 +01:00
sauilitired
a4a923c23c
Extract duplicated switch statement in EntityUtil
2018-11-15 00:08:32 +01:00
sauilitired
06f64aeff0
Extract duplicated method declaration
2018-11-15 00:06:20 +01:00
sauilitired
a8b4729845
Rename DBFunc#everyone to DBFunc#EVERYONE, and create two string constants 🐱
2018-11-14 23:51:56 +01:00
sauilitired
3c64376abe
Fix guest gamemode flag.
2018-11-14 23:40:27 +01:00
dordsor21
8cd54929e7
Merge branch 'master' into breaking
...
# Conflicts:
# Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotRateEvent.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEventUtil.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/GameModeFlag.java
# Core/src/main/java/com/intellectualcrafters/plot/commands/Clear.java
# Core/src/main/java/com/intellectualcrafters/plot/commands/PluginCmd.java
# Core/src/main/java/com/intellectualcrafters/plot/commands/Relight.java
# Core/src/main/java/com/intellectualcrafters/plot/commands/SetHome.java
# Core/src/main/java/com/intellectualcrafters/plot/config/C.java
# Core/src/main/java/com/intellectualcrafters/plot/config/Configuration.java
# Core/src/main/java/com/intellectualcrafters/plot/config/Settings.java
# Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java
# Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitEventUtil.java
# README.md
# Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotRateEvent.java
# Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeSchematicHandler.java
# Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/block/SpongeLocalQueue.java
# Sponge/src/main/java/com/plotsquared/sponge/util/SpongeEventUtil.java
2018-11-14 14:44:07 +00:00
sauilitired
8df7f63931
Refactor PS (and rename to PlotSquared)
2018-11-14 14:19:57 +01:00
sauilitired
16dbbe5244
Refactoring of PS#getPlots:
...
Initialize to HashSet rather than ArrayList, because of add in HashSet
is O(1) vs. add in ArrayList which is O(n). Also make the wrapping
set immutable.
2018-11-14 13:52:09 +01:00
NotMyFault
ae2869a29b
Translation update and fixing wrong lines
2018-11-05 16:00:44 +01:00
NotMyFault
302051a6ca
Minor cleanup
2018-10-20 14:03:21 +02:00
Jesse Boyd
b6d4872ca4
Merge pull request #2102 from dordsor21/master
...
Add PlotChangeOwner Event
2018-10-13 15:11:45 +11:00
NotMyFault
4b7ca2ff37
Minor cleanup
2018-10-10 18:29:21 +02:00
NotMyFault
1734c0e357
Rename ko_KR.yml to ko-KR.yml
2018-10-10 16:52:35 +02:00
NotMyFault
e2e34f24d6
Rename zh_CN.yml to zh-CN.yml
2018-10-10 16:51:43 +02:00
NotMyFault
765db2df0c
Added languages 'back'
2018-10-10 16:49:31 +02:00
NotMyFault
e1e6d95f75
Merge pull request #2049 from f0rb1d/master
...
Updated Simplified Chinese translation and formalized language codes.
2018-10-10 16:40:52 +02:00
NotMyFault
70584a338c
Update PS.java
2018-10-10 16:38:01 +02:00
NotMyFault
11e2777f60
Update PS.java
2018-10-10 16:36:14 +02:00
NotMyFault
b6303a7615
Update PS.java
2018-10-10 16:33:03 +02:00
NotMyFault
88e80f54f7
Updating locale names
2018-10-10 16:30:38 +02:00
dordsor21
9e9b21779c
Add PlotChangeOwner Event
2018-09-19 16:57:33 +01:00
NotMyFault
979b3c0408
Added bridge template and korean translation
2018-09-03 00:04:32 +02:00
NotMyFault
5b2428559a
Bridge template from the spigot page
2018-09-03 00:02:07 +02:00
NotMyFault
f001eebad4
Update Settings.java
2018-09-02 23:51:45 +02:00
Jesse Boyd
f5a981fda7
Fix plot visit sorting
2018-08-24 06:47:16 +10:00
sauilitired
587c942d88
Suppress PlotAPI warnings
2018-08-20 11:36:59 +02:00
sauilitired
e98c648244
Move PlotAPI to Core and move bukkit specific methods to BukkitUtil.
2018-08-20 11:35:41 +02:00
sauilitired
be9fb3bd3a
Remove deprecated methods without internal use.
2018-08-20 11:05:00 +02:00
sauilitired
01a927ccad
Allow PlotRateEvent to be cancelled. Fixes #2017
2018-08-19 23:12:59 +02:00
Jesse Boyd
4b8c434669
Fix compile (var must be final)
2018-08-12 21:36:04 +10:00
sauilitired
b0348cfc34
Update packages. This will not be appreciated 🐱
2018-08-10 17:53:15 +02:00
sauilitired
1646cd0f5a
Reformat code
2018-08-10 17:01:11 +02:00
Alexander Söderberg
bbcd508bc3
Remove unnecessary lines in Configuration javadoc
2018-08-10 16:04:43 +02:00
F0rb1d
a4f176fd07
Updated Simplified Chinese translation and formalized language codes.
2018-08-03 20:35:36 +08:00
Jesse Boyd
3d8d75170d
Check admin for setowner null
2018-07-31 14:28:22 +10:00
Jesse Boyd
2c11a292f4
Prevent multiple uses of plot auto
2018-07-29 21:43:07 +10:00
