Commit graph

7398 commits

Author SHA1 Message Date
cora
8e1a9e1785 Merge pull request 'mapgen/mcl_mapgen_core: move set_node decorations a node callback' (#2028) from fix-nether-wart into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2028
2022-02-25 21:28:40 +00:00
E
87e494f42b mapgen/mcl_mapgen_core: move set_node decorations a node callback
During the rewrite in 89e55e9065, a queue system was added to allow
using both VoxelManip-based generation steps, and set_node-based steps,
however some set_node-based steps (underground mushrooms, nether
decorations, and structures) were missed and remained in a VoxelManip
step. The result is that the changes made by the set_node stages were
overwritten after the (now-stale) VoxelManip data was committed later.

(ref. Mineclonia/Mineclonia#26)
2022-02-25 18:38:50 +01:00
cora
dfed21ee14 Merge pull request 'Revert mob rewrite' (#1992) from revert-to-oldmobs into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1992
2022-02-25 16:47:47 +00:00
cora
3feca330c9 fix the other 2 throw_xp occurences 2022-02-25 00:40:26 +00:00
cora
caacb378de fix api change in enchanting 2022-02-25 00:40:26 +00:00
cora
379972ea11 fix crash when blaze attacks logged off player 2022-02-25 00:40:26 +00:00
cora
414e2e7725 fix crash on opening villager formspec 2022-02-25 00:40:26 +00:00
cora
435b5d756d throw_experience->throw_xp (api change) 2022-02-25 00:40:26 +00:00
cora
2bb416765c revert to old mobs ( 32c03dc27e )
This reverts the hierarchies ENTITIES/mcl_mobs, ENTITIES/mobs_mc
and ENTITIES/mobs_mc_gameconfig to the state of commit
32c03dc27e
2022-02-25 00:40:26 +00:00
cora
02361b2d01 Merge pull request 'ITEMS/mcl_fire: fix laggy fire spread' (#1998) from fix-fire into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1998
2022-02-25 00:17:47 +00:00
cora
86ca401e4e do not randomseed twice 2022-02-25 00:08:26 +00:00
cora
378b5b30c9 fix beds dropping when burning up 2022-02-25 00:08:26 +00:00
cora
840b705a22 make fire use abms instead of laggy node timers 2022-02-25 00:08:26 +00:00
cora
80c79dde1c Merge pull request 'Fix handheld maps not displaying in Minetest 5.5.0' (#2010) from fix-mcl-maps-in-minetest-5.5 into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2010
2022-02-24 22:47:26 +00:00
Nils Dagsson Moskopp
27842aa2f5 Fix handheld maps not displaying in Minetest 5.5.0
The function dynamic_add_media() was changed in incompatible ways in
several minor versions of Minetest, breaking the display of handheld
maps in Minetest 5.5.0. This patch makes handheld maps display there.

The function was blocking with one argument in Minetest 5.3. It was also
blocking in Minetest 5.4, but took an additional argument for a function
to execute once the media had been received. Calling dynamic_add_media()
with a single argument had been deprecated; a function that did nothing
was provided in mcl_maps to satisfy the changed argument requirements.

In Minetest 5.5, dynamic_add_media() was changed to non-blocking. This
introduced a race condition in mcl_maps, where a client often tried to
display a map before it had received the map texture from the server.

Opening an issue on the Minetest issue tracker led to it being closed in
about 20 minutes: <https://github.com/minetest/minetest/issues/11997>
2022-02-24 22:43:45 +00:00
cora
85e0e23c76 Merge pull request 'Fix redstone comparator flooding crash by erlehmann' (#2027) from fix-comparator-crash into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2027
2022-02-24 21:35:12 +00:00
Nils Dagsson Moskopp
41550da87b Fix redstone comparator flooding crash
Redstone comparators have two modes, comparison mode & subtraction mode.
Before this patch, the functions to turn comparators on or off attempted
to swap nodes with comparators in the same mode, but failed to determine
the correct replacement node, if the existing node was not a comparator.

When a comparator in an on state (e.g. powered by a filled cauldron) was
flooded, the flooding dropped the comparator and replaced the comparator
node that was to be swapped out with air, which lead to a server crash.

This patch changes the functions that turn comparators on or off so they
only swap existing nodes with comparators in the same mode if the name
of the replacement node can be determined – i.e. if it is not nil.
2022-02-24 15:52:01 +01:00
cora
a4e541bcd2 Merge pull request 'remove blend1 file / add blend1 files to gitignore (fix #2015)' (#2024) from AFCMS/MineClone2:remove-blend1 into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2024
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
2022-02-24 14:48:51 +00:00
AFCMS
89a930ace3
add .blend2 and .blend3 files to gitignore 2022-02-24 10:16:48 +01:00
AFCMS
129117efb3
add .blend1 files to gitignore 2022-02-24 10:16:47 +01:00
AFCMS
cbfc71705d
remove blender backup file 2022-02-24 10:16:47 +01:00
cora
4b89398b3b Merge pull request 'Fix hopper breakage in get_item_group return value. (Fixes: #2022)' (#2023) from kabou/MineClone2:fix-hoppers into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2023
Reviewed-by: AFCMS <afcms@noreply.git.minetest.land>
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-02-24 02:23:09 +00:00
kabou
5431e206b0 Fix hopper breakage in get_item_group return value.
In commit 55009c257e that added vectors to
mcl_composters, mcl_hoppers was accidentally patched with a unrelated
change, updating it to get_item_group().  This mostly works, but in one
particular case the semantics of the return value differs.  Instead of
returning 'nil' it returns '0'.  That altered the evaluation of an if
condition, breaking the abm that sucks in items.

This commit fixes the conditional by explicitly comparing  '~= 0'.
2022-02-24 03:18:25 +01:00
cora
c60fd92638 Merge pull request 'Traditional chinese by emojigit (partial)' (#2026) from emojigit-zh-trans into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2026
2022-02-23 23:29:52 +00:00
Emojigit
06deb92dd6 mcl_tools 2022-02-23 23:58:05 +01:00
Emojigit
7685b4758f mcl_flowers 2022-02-23 23:58:05 +01:00
Emojigit
9944abb328 mcl_books 2022-02-23 23:58:05 +01:00
Emojigit
5ce1852c1d mcl_dye 2022-02-23 23:58:05 +01:00
Emojigit
56a70025b8 mcl_flowerpots 2022-02-23 23:58:05 +01:00
Emojigit
9fe3bbd2fa mcl_mushrooms 2022-02-23 23:58:05 +01:00
Emojigit
fb1d189d40 mcl_doors 2022-02-23 23:58:05 +01:00
Emojigit
9cd24f4af5 mcl_commands 2022-02-23 23:58:05 +01:00
Emojigit
a64c3f87bc xpanes 2022-02-23 23:58:05 +01:00
Emojigit
5075f2ca56 mcl_armor 2022-02-23 23:58:05 +01:00
Emojigit
249dfac319 mcl_inventory 2022-02-23 23:58:05 +01:00
Emojigit
2b5a0242db mcl_fire 2022-02-23 23:58:05 +01:00
Emojigit
790ccf0812 mcl_fishing 2022-02-23 23:58:05 +01:00
Emojigit
8d639794f3 mcl_fences 2022-02-23 23:58:05 +01:00
Emojigit
af8681c143 mcl_buckets 2022-02-23 23:58:05 +01:00
Emojigit
1ef58f7250 mcl_walls 2022-02-23 23:58:05 +01:00
Emojigit
15747220f2 mcl_hoppers 2022-02-23 23:58:05 +01:00
Emojigit
925dad7f5e mcl_anvils 2022-02-23 23:58:05 +01:00
Emojigit
729f653c85 mcl_portals 2022-02-23 23:58:05 +01:00
Emojigit
d1e328e57a mcl_bows 2022-02-23 23:58:05 +01:00
Emojigit
615a968fbb mcl_skins 2022-02-23 23:58:05 +01:00
Emojigit
7e5a9bd8b6 mcl_throwing 2022-02-23 23:58:05 +01:00
Emojigit
d018bee00a mcl_cake 2022-02-23 23:58:05 +01:00
Emojigit
1365d0b257 mcl_jukebox 2022-02-23 23:58:05 +01:00
Emojigit
a289a00427 mcl_heads 2022-02-23 23:58:05 +01:00
Emojigit
a238aabbb0 mcl_cauldrons 2022-02-23 23:58:05 +01:00