Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-11-21 18:25:12 +01:00
Code Issues Projects Releases Wiki Activity
4,192 Commits 29 Branches 96 Tags 60 MiB
develop
Commit Graph

4192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tastybento
d82b3488a2 Expand crop harvesting #2472 2024-08-18 19:40:08 -07:00
tastybento
103a611b8e Version 2.5.1 2024-08-17 08:03:39 -07:00
tastybento
3ee840f467
Merge pull request #2467 from BentoBoxWorld/develop 
Version 2.5.0
 2024-08-11 17:39:58 -07:00
tastybento
5df1965778 Fix test 2024-08-11 17:12:25 -07:00
tastybento
1b22725194
Merge pull request #2466 from BentoBoxWorld/1_21_1_updates 
1 21 1 updates
 2024-08-11 16:35:25 -07:00
tastybento
d3123a75bb Add 1.21.1 support 2024-08-11 16:34:31 -07:00
tastybento
137622fcae Version 2.5.0 2024-08-11 16:27:52 -07:00
tastybento
67dd30e709 Merge branch 'develop' of https://github.com/BentoBoxWorld/BentoBox.git into develop 2024-08-11 16:20:29 -07:00
tastybento
3c29f88d23 Put a try catch around head getting #2464 2024-08-11 16:20:20 -07:00
tastybento
bb80a15399
Merge pull request #2465 from BentoBoxWorld/2460_Banners_not_parsed_correctly_in_Spigot_1.21 
Use valueOf as the class is no longer an Enum
 2024-08-10 20:13:23 -07:00
tastybento
50dba5cb82 Use valueOf as the class is no longer an Enum 2024-08-10 20:06:39 -07:00
tastybento
ed700a1915 Use a common method for Events so they can be changed easily. 2024-08-10 20:04:34 -07:00
tastybento
27ba0fe26e
Merge pull request #2461 from BentoBoxWorld/2459_glow_api_backward_compatibility 
Add a try around the new API for glow and fallback to old way #2459
 2024-08-07 21:46:56 -07:00
tastybento
21efeb813b Make the catch specific to the potential error 2024-08-07 21:46:31 -07:00
tastybento
d2a6398b4d Add a try around the new API for glow and fallback to old way #2459 2024-08-07 21:29:26 -07:00
tastybento
3194195009
Merge pull request #2454 from BentoBoxWorld/2436_placeholder 
Added placeholder to show if a player is on an island or not
 2024-08-05 17:39:30 -07:00
tastybento
ac9aa91532 Fix tests 2024-08-05 17:38:53 -07:00
tastybento
220fc72a21
Merge pull request #2458 from BentoBoxWorld/2456_mysterious_exception 
More code to clean up when an island is deleted. #2456
 2024-08-05 17:06:21 -07:00
tastybento
c9c57e113f More code to clean up when an island is deleted. #2456 2024-08-05 12:22:32 -07:00
tastybento
7ed9ceaf22
Merge pull request #2457 from BentoBoxWorld/2456_mysterious_exception 
Handle nulls if they happen
 2024-08-05 12:09:54 -07:00
tastybento
2f055b2a8e Handle nulls if they happen 2024-08-03 09:03:19 -07:00
tastybento
afe07a8c23 Register and unregister done properly 2024-08-02 08:05:53 -07:00
tastybento
0766f2967d Merge branch 'develop' of https://github.com/BentoBoxWorld/BentoBox.git into develop 2024-08-02 07:45:46 -07:00
tastybento
505de3b5f9 Use a long to calculate the purge limit. This may solve a problem 
reported on Discord. Suspect is that there may be a calculation
overflow.
 2024-08-02 07:45:38 -07:00
tastybento
5e3c55f3d6
Merge pull request #2451 from TreemanKing/API-hideWhen 
feat: further api improvements to hideWhen
 2024-08-01 10:15:25 -07:00
tastybento
fc589334df
Merge branch 'develop' into API-hideWhen 2024-08-01 10:14:03 -07:00
tastybento
fc22fd23da Fix for NPE when unregistering islands via console 
Issue is that console does not have a UUID to log.
 2024-07-30 21:48:16 -07:00
TreemanK
ef86bdbdc5 feat: further api improvements hideWhen 2024-07-29 11:39:56 +10:00
tastybento
d704aa9c67 Use dedicated glint API instead of enchantments 2024-07-28 15:43:04 -07:00
tastybento
cccc9ee98d WIP 2024-07-28 15:27:44 -07:00
tastybento
1155ffd08e
Merge pull request #2450 from BentoBoxWorld/2437_conditional_flag_visibility 
Provides an API to hide sub-flags #2437
 2024-07-27 21:22:30 -07:00
tastybento
f4d3e791d6 Provides an API to hide sub-flags #2437 2024-07-27 21:22:08 -07:00
tastybento
037e66f6f6
Merge pull request #2449 from BentoBoxWorld/develop 
Release 2.4.2
 2024-07-27 16:27:44 -07:00
tastybento
86945bdfbe
Merge pull request #2448 from BentoBoxWorld/2445_placeholders_for_coop_and_trusted 
Add placeholders for trusted and coop island members #2445
 2024-07-27 13:42:11 -07:00
tastybento
fcff388810 Add placeholders for trusted and coop island members #2445 2024-07-27 13:39:37 -07:00
tastybento
ad10205c99
Merge pull request #2447 from BentoBoxWorld/2446_new_player_cannot_load_console_error 
Fix for #2446 that showed console error when player joined.
 2024-07-27 13:18:27 -07:00
tastybento
05eef0f8ef Fix for #2446 that showed console error when player joined. 2024-07-27 13:18:15 -07:00
tastybento
11540c047f
Merge pull request #2444 from BentoBoxWorld/2240_Potions_for_Required_Items_causes_Challenges_to_Error 2024-07-26 07:46:42 -07:00
tastybento
4bfd405c4e Add try/catch around potioneffects for older servers 2024-07-23 13:19:24 -07:00
tastybento
a7c9ae6e36
Merge pull request #2443 from BentoBoxWorld/2442_Blueprint_has_JSON_error 2024-07-23 10:50:25 -07:00
tastybento
93d50db77f #2442 Fixes issue with loading blueprints with villagers on 1.21 2024-07-23 10:37:10 -07:00
tastybento
9fccb89261
Merge pull request #2435 from BentoBoxWorld/2433_inventory_click_event_priority 
Shift InventoryClickEvent listener to LOW priority #2433
 2024-07-16 22:07:26 -07:00
tastybento
30ffc5f919 Shift InventoryClickEvent listener to LOW priority #2433 2024-07-16 22:06:47 -07:00
tastybento
c1582a81cd Prevent concurrent modification exception 2024-07-16 21:39:57 -07:00
tastybento
c6ed2a8ccd Merge branch 'develop' of https://github.com/BentoBoxWorld/BentoBox.git into develop 2024-07-16 20:54:57 -07:00
tastybento
d9ef8dfd10 Remove isGenerated checks 2024-07-16 20:54:47 -07:00
tastybento
f515ae2e84
Merge pull request #2432 from BentoBoxWorld/2422_flags_for_1.21 
2422 flags for 1.21
 2024-07-16 17:11:44 -07:00
tastybento
72515170d4
Merge branch 'develop' into 2422_flags_for_1.21 2024-07-16 17:11:18 -07:00
tastybento
18cd62dd6c Slight tweak to not cause lag due to a inGenerated query 2024-07-14 21:49:51 -07:00
tastybento
570fe7448e WIP Try to add protection to decorative pots. 2024-07-14 21:44:43 -07:00