1
0
Fork 0
Commit Graph

11392 Commits (f1568483b3668c40f6ad7037aedc6c5bef44ac0c)

Author SHA1 Message Date
the-real-herowl f1568483b3 Merge pull request 'Keep axolotls from attacking sheep' (#3963) from ThePython10110/MineClone2:axolotl-sheep into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3963
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2023-10-11 00:50:12 +00:00
ThePython10110 d7fa24ebf8 Keep axolotls from attacking sheep 2023-10-10 23:50:46 +00:00
chmodsayshello 712a6d6c66 Merge pull request 'add 1.20 armor trims' (#3784) from armor_trims into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3784
Reviewed-by: AFCMS <afcm.contact@gmail.com>
2023-10-03 21:46:00 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 a620d24ec8 Fix a number of crashes involving unknown nodes, also fix fishbuckets on_place (#3914)
Fixes: #3913 #3915

~~You can reproduce the crash by placing a fish bucket on top snow above an unknown node.

I also noticed that the code always uses pointed_thing.above so I fixed that and also added a function to mcl_utils to figure out where a node should be placed (either above or below). Looks like the rest of the code could also use improvement but at least it does not crash now.~~

Cora fixed a bunch of related crashes in Mineclona so I am replacing my commit and cherry picking all her commits here.
https://codeberg.org/mineclonia/mineclonia/pulls/549

Here is the list of fixes from that PR:
- Crash when placing snow layer on unknown nodes
- Crash when snow layers on unknown nodes are flooded
- Crash when placing fishbucket on snow on top of unknown nodes
- Crash when placing chorus flower and stem on unknown
- Crash when placing mob spawners on unknown
- The fishbucket on place to actually replace buildable_to

Co-authored-by: cora <coradelamouche@gmx.ch>
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3914
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-authored-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
Co-committed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-09-29 18:47:07 +00:00
ancientmarinerdev 178b24886f Merge pull request 'mcl_oxidation: typo in README.' (#3910) from mdk/MineClone2:typo into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3910
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-09-29 18:41:27 +00:00
ancientmarinerdev 8333281b4f Merge pull request 'Halved the creeper explosion timer reset radius' (#3808) from reduce-explosiontimer_reset_radius into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3808
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-09-29 18:36:28 +00:00
Nicu 6d3e55ce12 Reduced the creeper explosion timer reset radius from 6 to 3
This gives the player just enough time to get out of the creeper's range, to reset their explosion timer and avoid unnecessary destruction.
2023-09-29 18:35:21 +00:00
ancientmarinerdev 2c2f5595f3 Merge pull request 'Add Setting to keep respawn location set if bed is destroyed.' (#3933) from Eliy21/MineClone2:no_bed_respawn_setting into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3933
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
2023-09-29 18:29:31 +00:00
chmodsayshello 8936313fb3 proper itemslot background
redo of 904cd78d3f ; caused some issues after cherry pick, same texture
2023-09-29 16:59:45 +02:00
ancientmarinerdev c51442704c Merge pull request 'mcl_skins: link to official mcl_custom_skins' (#3954) from skins into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3954
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-09-28 19:43:24 +00:00
Johannes Fritz 2bd6678b08 mcl_skins: link to official mcl_custom_skins 2023-09-28 13:09:45 -05:00
Codiac e0c44244f9 Merge pull request 'Point mcl_custom_skins link to a working URL' (#3949) from Montandalar/MineClone2:fix_url_mcl_custom_skins into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3949
Reviewed-by: Codiac <codiac@noreply.git.minetest.land>
2023-09-28 10:40:03 +00:00
Codiac 5b7352a23a Merge pull request 'Fix Server crash (Issue #3939)' (#3947) from Michieal/MineClone2_For_PRs:Bamboo_Fix_PointedThing into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3947
Reviewed-by: Codiac <codiac@noreply.git.minetest.land>
2023-09-28 10:39:23 +00:00
Michieal e8c658658d Update Credits. 2023-09-26 18:59:51 +00:00
Michieal e9d994b74d Fix Campifires API to not crash the server.
Fixed the error in Campfires' On_RightClick() to not error out when called with a non-existent pointed_thing.
2023-09-26 18:57:17 +00:00
Michieal eafe6627d8 Extra checks placed in. 2023-09-26 18:35:12 +00:00
chmodsayshello 4046a68fbf Add trim snippet 2023-09-26 20:24:54 +02:00
Blockhead 882c3ef339 Point mcl_custom_skins link to a working URL 2023-09-25 19:55:36 +10:00
Michieal b2ebcf5d4f Readme Change
Putting my name back into the credits in the mod.
2023-09-20 06:07:13 +00:00
Michieal f57220f784 Fix Server crash (Issue ##3939)
Fixes the error of pointed_thing being nil (null) by first checking to see if it exists, and if not, exit the on_place call back.
2023-09-20 05:57:49 +00:00
Eliy21 2d9bffaa43 Update settingtypes.txt
Add the no bed respawn in settings
2023-09-11 19:42:04 +00:00
Eliy21 eb658a4996 Update mods/PLAYER/mcl_spawn/init.lua
Add if then condition for no bed/anchor respawn settings
2023-09-11 19:38:33 +00:00
ancientmarinerdev b4c693bb20 Merge pull request 'Campfire Updates' (#3769) from campfire_update into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3769
2023-09-04 22:20:48 +00:00
ancientmarinerdev bd46428d65 Updated credits 2023-09-04 22:05:38 +00:00
ancientmarinerdev 9e53efbc3e Fix campfire smoke timing 2023-09-04 22:05:38 +00:00
ancientmarinerdev 6b36abfe91 Fix credits 2023-09-04 22:05:38 +00:00
ancientmarinerdev 49e7449d7f Implement feedback and add credit 2023-09-04 22:05:38 +00:00
ancientmarinerdev 1d28a8e4ac Convert campfire particle spawning from ABM to particle spawner 2023-09-04 22:05:38 +00:00
Wbjitscool c32e88e910 Add better smoke particles 2023-09-04 22:05:38 +00:00
thunder1035 969fa98f18 Update campfire model and textures 2023-09-04 22:05:38 +00:00
PrairieWind 107420c80f Offset smoke a bit 2023-09-04 22:05:38 +00:00
PrairieWind f9afc74077 Add changes to campfires from feedback 2023-09-04 22:05:38 +00:00
PrairieWind 21f0c7750b Throw experience points after food is cooked 2023-09-04 22:05:38 +00:00
PrairieWind 04b59b2190 Campfires are unaffected by pistons 2023-09-04 22:05:38 +00:00
PrairieWind 15bb4fa4bf Players don't take burn damage when they have fire resistance potion in use, or frost walker boots
Entities seem to not burn anymore, and I am not sure why.
2023-09-04 22:05:38 +00:00
PrairieWind 4c3e521779 Fix campfire drops to work correctly with creative and silk touch 2023-09-04 22:05:38 +00:00
DinoNuggies4665 4c59b189dd changed line 82 to vector.new(), and refactored setting food wield item (wield_image doesn't matter) 2023-09-04 22:05:38 +00:00
PrairieWind 23d6c3d17b Update campfire rightclick and smothering 2023-09-04 22:05:38 +00:00
DinoNuggies4665 61f489e71f Food entities don't turn back to mutton when leaving a re-joining now 2023-09-04 22:05:38 +00:00
DinoNuggies4665 4616b6c3ec The food is now oriented the right direction when on the cooking on the campfire, and food entities are removed when the campfire is destroyed, still doesn't drop items though 2023-09-04 22:05:38 +00:00
DinoNuggies4665 d92296712c Fixed crash when standing on campfire whilst food is cooking 2023-09-04 22:05:38 +00:00
DinoNuggies4665 5b212dd3fe Made food entities local to evcery campfire, and made one food entity that works for all foods 2023-09-04 22:05:38 +00:00
PrairieWind d3095fea57 Update ignition, smothering, and campfire inventory drops
Bonus fix for grass path creation sound traveling across the entire server
2023-09-04 22:05:38 +00:00
DinoNuggies4665 177196a8d2 modified: mods/ITEMS/mcl_campfires/api.lua
modified:   mods/ITEMS/mcl_fishing/init.lua
	modified:   mods/ITEMS/mcl_mobitems/init.lua
2023-09-04 22:05:38 +00:00
DinoNuggies4665 13d4841097 A couple of fixes 2023-09-04 22:05:38 +00:00
DinoNuggies4665 0b7cec419a Added visible items cooking on the fire 2023-09-04 22:05:38 +00:00
DinoNuggies4665 cef6c72a71 modified: mods/ITEMS/mcl_campfires/mod.conf 2023-09-04 22:05:38 +00:00
DinoNuggies4665 aca82fcafc modified: mods/ITEMS/mcl_campfires/api.lua
modified:   mods/ITEMS/mcl_mobitems/init.lua
2023-09-04 22:05:38 +00:00
DinoNuggies4665 a7fcd62999 Added visible items cooking on the fire 2023-09-04 22:05:38 +00:00
PrairieWind d489c954f5 Campfires make big smoke
Smells like carcenogens, yum
2023-09-04 22:05:38 +00:00