Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-11-28 13:45:14 +01:00
Code Issues Projects Releases Wiki Activity
1,442 Commits 28 Branches 97 Tags 60 MiB
e4d2c0b3cf
Commit Graph

1224 Commits

Author SHA1 Message Date
tastybento
044c67ea28 Fixes bug with concurrent saving of files to the database. 
Implemented a FIFO to queue async save requests for YAML and MySQL.

The assumption is that most database objects will be held in memory
because the ordering of object loading is not handled. That means that
it is theoretically possible to load something on the main thread before
it has been saved in the async thread if you are really quick. So, in
general, you should load objects once and ideally never load them again
unless there's a big span of time in between so the async can finish.
For most situations, this race condition should not occur, but I'm just
warning about it.

Saving on shutdown is not async and takes as long as it takes.

Also added some defensive code to disable the plugin if the database
connection info is wrong and print an error message instead of lots of
errors.

Changed CleanSuperFlatListener to use a LinkedList for its queue.
 2019-01-13 22:17:36 -08:00
tastybento
5ed86ea271 Adds defensive code to avoid NPE with hiding clipboard 2019-01-13 15:57:45 -08:00
tastybento
fa8c0ec0c8 Implements async superflat cleaning 
Should avoid crashes when there's a lot of cleaning to do.

https://github.com/BentoBoxWorld/BentoBox/issues/431
 2019-01-13 15:53:12 -08:00
tastybento
ad3d044e88 Merge branch 'develop' of https://github.com/BentoBoxWorld/bentobox.git into develop 2019-01-13 14:19:31 -08:00
tastybento
96639792b8 Fixed random test failures. 
Note: If using the User class in a test, you MUST set the mock plugin object using the User.setPlugin() method otherwise each test will use the wrong plugin object and verifications will not work.
 2019-01-13 14:19:23 -08:00
Florian CUNY
8260728e9b Added NonNull/Nullable annotations to CommandsManager 2019-01-13 18:41:38 +01:00
Florian CUNY
a66bc90746 Fixed code smells 2019-01-13 18:27:14 +01:00
Florian CUNY
270e14167e Made IslandTeamInviteAcceptCommand require confirmation 
Closes #464.
 2019-01-13 17:35:32 +01:00
tastybento
d8eab7e397 Adds deleteID method to MariaDB 2019-01-13 08:14:08 -08:00
Florian CUNY
35883435e5 Merge branch 'develop' into IslandDelete 2019-01-13 10:33:50 +01:00
Florian CUNY
6f4d3aeaed Added some more javadoc 2019-01-13 10:28:49 +01:00
Florian CUNY
9cf63611e4 Added some NonNull/Nullable in database code 2019-01-13 10:27:36 +01:00
Florian CUNY
dc7d5b40f2 Renamed DeletedIslandDO to IslandDeletion 2019-01-13 10:21:06 +01:00
Florian CUNY
0f253c35ef Renamed IslandDeleteManager to IslandDeletionManager 2019-01-13 10:09:35 +01:00
Florian CUNY
165a70aec9 Added MariaDB minimum version in config comment 2019-01-13 10:06:32 +01:00
Florian CUNY
348704f3d9 Added javadoc and updated Settings for MARIADB 
@barpec12
 2019-01-13 10:05:24 +01:00
tastybento
7854187448 Added async saving to YAML and MYSQL 
Both seem to work fine, but probably need more real-world testing.
 2019-01-12 18:18:22 -08:00
tastybento
501c3257ed Island delete enhancements 
Island deletion is done a few chunks at a time per tick. Current speed
is 5 chunks per tick per world (e.g., 15 chunks per tick if nether and
end islands are used).

Chunks are deleted based on the all-time maximum protection range of the
island. This is because the protection range can grow bigger or smaller
over the island's lifetime. To ensure all possible chunks are erased,
the largest every protection range is remembered and used.

Very large protection ranges will take a long time to fully delete.

Info on islands that are being deleted is stored in the database. If the
server shuts down mid-deletion, deletion will restart when the server
restarts.

While an island is being deleted, new islands cannot occupy that spot
and the spot cannot be reserved by the admin.

In addition, async approaches to island saving and player saving were
removed. Async will be implemented another way.

Now, instead of saving the full island or player database, individual
database entries are saved instead to be more efficient.
 2019-01-12 17:12:30 -08:00
tastybento
7a4ca8b48d Fixed JavaDoc error 2019-01-12 17:04:53 -08:00
Florian CUNY
a1b6f97a1a
Merge pull request #460 from barpec12/master 
MariaDB 10.2.3+ support.
 2019-01-12 22:57:01 +01:00
tastybento
7c1e195eaf Switch to timer-based chunk deletion 2019-01-12 10:31:25 -08:00
Florian CUNY
457b296372 Fixed code smells 2019-01-12 18:29:20 +01:00
Florian CUNY
76d4edd19f Added NonNull/Nullable to FlagsManager; deprecated getFlagById(String) 
Added getFlag(String) that will return an optional instead.
 2019-01-12 18:03:19 +01:00
Florian CUNY
12619e79db Improved links in LogEntry's javadoc 2019-01-12 18:02:32 +01:00
Florian CUNY
c783fa8e16 Started to add Nullable/NonNull annotations 2019-01-12 17:30:47 +01:00
barpec12
961ca02fa1 MariaDB 10.2.3+ support. 2019-01-10 16:54:11 +01:00
tastybento
b51178518a Fixes admin setowner and info commands for team members 
https://github.com/BentoBoxWorld/BentoBox/issues/452
 2019-01-07 21:37:37 -08:00
tastybento
cd4f0c2561 Fixes Invincible Visitors Settings GUI bug 
https://github.com/BentoBoxWorld/BentoBox/issues/450

Added enhanced test to this class too.
 2019-01-07 21:03:02 -08:00
tastybento
8a63bf80f9 Added defensive code to avoid infinite loop 
CleanSuperFlat can infinite loop if the generator isn't working.
 2019-01-07 20:43:37 -08:00
tastybento
dc8b672286 Added check against duplicate Island UUIDs 
May relate to https://github.com/BentoBoxWorld/BentoBox/issues/447
 2019-01-07 08:03:38 -08:00
tastybento
acb6cd5650 Added defensive null checking code to DB 
Relates to https://github.com/BentoBoxWorld/BentoBox/issues/447
 2019-01-07 07:46:59 -08:00
Florian CUNY
9eec14ffb3
Merge pull request #445 from BONNe/patch-1 
Unnecessary getPermissionPrefix()
 2019-01-07 06:25:57 +01:00
BONNe
dbbfdaea7f
Unnecessary getPermissionPrefix() 
Kryniowesegryderiusz <3 in Support noticed that Admin tp command has double bskyblock.bskyblock, and I found reason in code.
This getPermissionPrefix() is not necessary, as setPermission() will also add prefix.
 2019-01-06 23:32:15 +02:00
Florian CUNY
fe101a6e01 Added "UNOWNED" log to Island 2019-01-06 11:46:25 +01:00
Florian CUNY
d7fbfdb784 Added Island#setRank(UUID, int) 2019-01-06 11:28:37 +01:00
Florian CUNY
55afa166cd Added some defensive code in some Island's methods 2019-01-06 11:03:32 +01:00
Florian CUNY
9387f65dbf Added IslandBanEvent and IslandUnbanEvent (cancellable) 2019-01-05 10:23:53 +01:00
Florian CUNY
e3574e5ee3 Added AdminSetspawnCommand 
#441
 2019-01-04 21:33:17 +01:00
Florian CUNY
85fac3112f Improved IslandsManager#setSpawn(Island) + Javadoc 
Added some checks to improve the handling.
 2019-01-04 21:33:02 +01:00
Florian CUNY
185082f261 Improved Island#isSpawn() and Island#setSpawn() Javadoc + improved handling of Island#setSpawn() and added logging to the Island history 2019-01-04 21:32:21 +01:00
Florian CUNY
c78efb8736 Fixed and improved error handling when loading addons 
Fixes #440

* Added Addon#getState()
* Added LOADED in Addon.State
* Added AddonsManager#getLoadedAddons() and AddonsManager#getEnabledAddons()
* Improved the loading addons "workflow"
 2019-01-04 11:33:35 +01:00
Florian CUNY
2b0ccb4099 Release 1.0 ( 🎉 ) 2019-01-03 20:53:18 +01:00
Florian CUNY
967ebccae1 Fixed 'banCooldown' config comment 2019-01-03 20:47:54 +01:00
Florian CUNY
ef96a01fc8 Fixed bug with the YAML Database when saving config containing hidden ConfigEntry 2019-01-03 20:45:51 +01:00
Florian CUNY
74a28963b4 Improved the "aborting bentobox enabling" message 2019-01-03 20:35:51 +01:00
Florian CUNY
d2f10d883d Set enableAutoOwnershipTransfer to false 2019-01-03 20:26:26 +01:00
Florian CUNY
81435c57f5 Delete GameWorld.puml 2019-01-03 20:26:10 +01:00
tastybento
d13ae470d5 Removed unused imports. 2019-01-03 10:25:03 -08:00
tastybento
2713f58ac5 Fix to fire Island events after an island is created. 
Events were firing too early before the island had been fully pasted
async.
 2019-01-03 10:24:50 -08:00
tastybento
8452a080f7 Merge branch 'develop' of https://github.com/BentoBoxWorld/bentobox.git into develop 2019-01-03 09:47:04 -08:00
tastybento
5351b162c5 Moved obsidian scooping to be a world flag in settings 2019-01-03 09:46:56 -08:00
Florian CUNY
000d556c7f Improved the "successfully-loaded" message 2019-01-03 18:12:32 +01:00
Florian CUNY
4b4ee1646e Added '@a' to AdminResetsResetCommand so that we can reset everyone 2019-01-03 17:43:00 +01:00
Florian CUNY
9545c74833 Removed since Javadoc tags 2019-01-03 17:28:18 +01:00
Florian CUNY
a5831947c2 Made automated ownership transfer settings hidden for now 2019-01-03 17:22:20 +01:00
Florian CUNY
4a6a109fa4 Added ConfigEntry#hidden() 2019-01-03 17:22:05 +01:00
Florian CUNY
9f676636e0 Fixed some code smells 2019-01-03 17:09:27 +01:00
Florian CUNY
160749c065 Merge branch 'develop' into 167-automated-island-ownership-transfer 2019-01-03 16:59:13 +01:00
Florian CUNY
2e2c7c69de Removed deprecated classes 2019-01-03 16:51:57 +01:00
Florian CUNY
bde91b7784 Fixed commands being registered with their main label as fallbackPrefix 
This has been replaced by "bentobox" or the addon's name.
 2019-01-03 16:40:51 +01:00
Florian CUNY
708c014d14 Moved allowObsidianScooping to WorldSettings and renamed ObsidianToLava to ObsidianScoopingListener 
#432
 2019-01-03 16:30:36 +01:00
Florian CUNY
915cd6f293 Made 'general.rank-command' experimental in config 
#432
 2019-01-03 16:19:08 +01:00
Florian CUNY
c549d969a4 Removed 'island.custom-ranks' from config 
#432
 2019-01-03 16:17:01 +01:00
Florian CUNY
369600e4d5 Renamed Island#addToBanList() and Island#removeFromBanList() + added log in them 
They respectively got renamed to Island#ban() and Island#unban(). They now require the UUID of an issuer (which can be null, but it's better to provide one)
 2019-01-03 15:59:24 +01:00
Florian CUNY
fa3dbc5519 Made LogEntry use the Builder pattern 2019-01-03 13:51:46 +01:00
Florian CUNY
245062b36e Removed the offline message "TODO" in User 
Most of it will be handled by the Island history
 2019-01-03 13:37:54 +01:00
Florian CUNY
0b62c7cf76 Made LogEntry#data a Map<String, Object> 2019-01-03 13:33:46 +01:00
Florian CUNY
265afaf345 Added history to island and Island#log(LogEntry) 2019-01-03 13:26:20 +01:00
Florian CUNY
a638b09ce3 Added LogEntry and its database adapter 2019-01-03 13:25:52 +01:00
tastybento
96bf67eb19 Added generic reload command for addons to use 
This command just runs the onReload method so that individual addons can
reload their stuff.
 2019-01-02 15:40:49 -08:00
Florian CUNY
396425a52d Started implementing automated island ownership transfer 
#167
 2019-01-02 23:02:52 +01:00
Florian CUNY
4ae36ef8e0 Fixed Island#getMemberSet() Javadoc 2019-01-02 23:01:39 +01:00
tastybento
b8312db655 Fixes double home teleport when resetting island. 2019-01-02 10:55:11 -08:00
tastybento
5f193b19f5 Merge remote-tracking branch 'origin/develop' into async-paste2 2019-01-02 10:44:50 -08:00
tastybento
81a0b3290f Adjustment to English locale file for addon reloading 
https://github.com/BentoBoxWorld/BentoBox/issues/370
 2019-01-02 10:22:39 -08:00
Florian CUNY
be91e137a8 Implemented Addons reloading 
Relates (a bit) to #370
 2019-01-02 17:49:37 +01:00
Florian CUNY
c7a85c2b5a Fixed AddonDescription to use a valid Builder pattern 
AddonDescriptionBuilder has been renamed to AddonDescription.Builder ; and there is no longer public constructors in this class.

This change is obviously API breaking, but it's relatively "internal", so hopefully people didn't use it.
 2019-01-02 17:28:11 +01:00
Florian CUNY
30c20216fa Metrics: added islands count line chart 2019-01-02 16:54:58 +01:00
Florian CUNY
6f0912e1d2 Added ITEM_FRAME flag 
#391.
 2019-01-02 15:29:27 +01:00
Florian CUNY
01b7ace0be Fixed code smells 2019-01-02 14:48:17 +01:00
Florian CUNY
c078d8dce6 Added ban limit (#getBanLimit() in WorldSettings) 
Closes #423.

I had some trouble with unit testings, that's why I didn't update them to test the new features :(
 2019-01-02 14:37:52 +01:00
Florian CUNY
efd0aba8e8 Improved WorldSettings Javadoc 2019-01-02 13:45:21 +01:00
Florian CUNY
2bef086db4 Improved some config comments in Settings 2019-01-02 13:45:09 +01:00
tastybento
5b6bd72370 Added null checking protection. 
This may help if a database is becoming corrupted.
 2019-01-01 17:47:25 -08:00
tastybento
f475ebf3d2 Putting the config saving back in. 2019-01-01 14:04:26 -08:00
tastybento
665ad1e0a4 Final touches 2019-01-01 14:01:01 -08:00
Florian CUNY
4a7a4ed7db Improved Javadocs in User 2019-01-01 21:50:20 +01:00
tastybento
d039bf0c10 Merge remote-tracking branch 'origin/develop' into async-paste2 2019-01-01 12:47:57 -08:00
Florian CUNY
3bc36b54c9 Updated default config.yml 2019-01-01 21:00:21 +01:00
Florian CUNY
80fccbab96 Removed general.starting-money from config 
#432
 2019-01-01 20:54:19 +01:00
tastybento
512fb8e544 2019 baby! 2019-01-01 08:45:11 -08:00
tastybento
0da0d6c6f7 Removed unneeded enum values. Improved const names. 2018-12-31 11:31:35 -08:00
tastybento
2528442d6b Rewrote using state approach to be easier to understand. 
Backwards compatible with current schems. New schems required to avoid
torch popping etc. Look for updates to AcidIsland and BSB.
 2018-12-31 11:24:24 -08:00
Florian CUNY
5601ffaf8a Added a server compatibility check that ensures BentoBox doesn't get run on incompatible server software / version. 2018-12-31 14:22:57 +01:00
tastybento
38e82ee617 WIP: Enables async-style pasting of schems. 
Speed of schem pasting is in the config.yml of BentoBox.

Old schems will work and paste async, but attached blocks, e.g.,
torches, may fall off due to being pasted ticks before the supporting
block is pasted. Newer schems will not have this issue.

Further work is needed to optimize entity pasting.

Known issue: if a player logs out during the pasting, things go wrong
until the next reload. Needs investigation and mitigation.

There's no mitigation against the server shutting down or crashing
mid-paste.
 2018-12-30 20:34:50 -08:00
tastybento
c4a5eb2c88 WIP pastes but attachments fall when split across paste boundaries 2018-12-30 18:09:56 -08:00
tastybento
cf0fdf45b9 Merge branch 'develop' into async-paste2 2018-12-30 16:48:54 -08:00
tastybento
597fc082be WIP Added staggered pasting 2018-12-30 14:54:37 -08:00
tastybento
9b478fbef6 Fixed NPE in IslandManager on startup 2018-12-30 14:49:04 -08:00
Florian CUNY
26c65f9b54 Moved the admin resets-related commands under their own node 
Preparing #353.

AdminClearresetsallCommand is deprecated with no current alternative right now.
 2018-12-29 10:52:13 +01:00