Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity
11,730 Commits
85 Branches
80 Tags
173 MiB
Commit Graph

11730 Commits (3d5887875011cf822d0bd958b367a637696029bb)

Author SHA1 Message Date
seventeenthShulker bc3bde4cf8 Forgot about blackstone 2023-10-22 02:14:17 +00:00
seventeenthShulker 8099a4bd17 Walls use `source` parameter for default hardness and blast resistance 
If no `source` given, fallbacks are 2 and 6 respectively
 2023-10-22 02:14:17 +00:00
seventeenthShulker e2ed1ab4a6 Fix prismarine bricks and dark variant blast res. 
Should be 6 like regular prismarine
 2023-10-22 02:14:17 +00:00
seventeenthShulker e43a8e267d Un-hardcode blast resistance, hardness for walls, 
now only based on their material
 2023-10-22 02:14:17 +00:00
seventeenthShulker 570caf47eb All wood-type and nether-type fences now match material's blast resistance 2023-10-22 02:14:17 +00:00
the-real-herowl 59f3b53a51 Merge pull request 'Use MC 1.18+ light levels to control mob spawning' (#3946) from spawn_lighting into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3946
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
 2023-10-22 01:35:00 +00:00
chmodsayshello ec7e99019e add trim advancements 2023-10-21 22:25:30 +02:00
Dehydrate6684 b320d008ca
Unhardcoded nil 2023-10-18 08:04:54 +08:00
the-real-herowl 3d7155c1b9 Merge pull request 'Raise player eye height to 1.6 blocks.' (#3967) from Dark/MineClone2:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3967
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
 2023-10-16 16:41:18 +00:00
chmodsayshello e3ab94809e Merge pull request 'Fixed a crash in minetest vector code that isn't propogated to lua.' (#3966) from fix_rotate_around_axis_crash into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3966
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
 2023-10-16 12:21:56 +00:00
Dark a66be39d9b Raise player eye height to 1.6 blocks. 
This is the same as in Minecraft. The previous value of 1.5 can feel very strange for those coming from that game.
 2023-10-16 00:15:12 +00:00
ancientmarinerdev 3564f6ebde Fixed a crash in minetest vector code that isn't propogated to lua. Create util for ease of use. 2023-10-15 22:03:48 +01:00
chmodsayshello f99ae93bf6 Merge pull request 'fix crash when opening a chest that has an unknow node on it' (#3964) from pepebotella/MineClone2:chest-under-unknow into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3964
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
 2023-10-15 19:21:10 +00:00
Freeman 8d440252a4 fix crash when opening a chest that has an unknow node on it 
fix #3961
 2023-10-13 21:07:00 +02:00
the-real-herowl d706833f21 Merge pull request 'Wither finishing & effect fixes' (#3957) from the-real-herowl/MineClone2:wither into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3957
 2023-10-11 20:46:24 +00:00
the-real-herowl c874e01cf9 Wither falling when no target found and small fixes 2023-10-11 00:54:31 +00:00
the-real-herowl 7ce82b9dcb Peaceful crash fixed 2023-10-11 00:54:31 +00:00
the-real-herowl 645072507f Wither melee attack and bug fixes 2023-10-11 00:54:31 +00:00
the-real-herowl 924a6c1c47 Settings-related fixes 
-moved to the cleaner way of obtaining settings values
-disabled the anti-troll measures by default
-made the wither per-dimension limit dependent on the settings
-(anti-troll measures enabled required for wither counting and limit)
 2023-10-11 00:54:31 +00:00
the-real-herowl 20b0f0748d Added some comments to the code 2023-10-11 00:54:31 +00:00
the-real-herowl d7c76e33d8 Tiny adjustments 
- wither initial explosion radius moved from a magic value into a local variable
- wither initial explosion radius reduced
- wither attack_exception improved to better handle unlikely edge cases
 2023-10-11 00:54:31 +00:00
the-real-herowl 966712f4ff Optimisation and cleanup 
-optimised and cleaned up wither rose withering effect code
-removed unused code
 2023-10-11 00:54:31 +00:00
the-real-herowl e4102e6124 Implemented wither defensive measures 
Added block breaking when hit, or a safe_boom when hit and mobs_griefing
is disabled. Removed dubious anti-troll measures.
 2023-10-11 00:54:31 +00:00
the-real-herowl 17c8f220e6 A few more wither fixes 2023-10-11 00:54:31 +00:00
the-real-herowl df17688b7d Great batch of improvements 2023-10-11 00:54:31 +00:00
the-real-herowl 729d8ec9e0 Another batch of wither adjustments 2023-10-11 00:54:31 +00:00
the-real-herowl c9dc12b081 Further wither adjustments 2023-10-11 00:54:31 +00:00
Nauta Turbidus a1b6819756 Withering effect and effect immunities 
Added withering effect and immunities to effects.

Signed-off-by: Nauta Turbidus <88062389+nauta-turbidus@users.noreply.github.com>
 2023-10-11 00:54:31 +00:00
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
Dehydrate6684 23468cc2dd
Used vector.offset instead of add/subtract 2023-10-10 09:39:16 +08:00
Dehydrate6684 0c48a46f7c
Updated code based on reviews 2023-10-09 13:55:08 +08: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
codiac 95db118361 Add rules for blaze, wither skeleton, silverfish 2023-09-22 09:09:35 +10:00
codiac d2d7887e0f Handle bat and slime light checks 2023-09-21 14:53:32 +10:00