aboutsummaryrefslogtreecommitdiff
path: root/builtin/game
diff options
context:
space:
mode:
Diffstat (limited to 'builtin/game')
-rw-r--r--builtin/game/item.lua2
-rw-r--r--builtin/game/item_entity.lua4
-rw-r--r--builtin/game/knockback.lua2
-rw-r--r--builtin/game/misc.lua2
4 files changed, 5 insertions, 5 deletions
diff --git a/builtin/game/item.lua b/builtin/game/item.lua
index 2e8fcc343..1d1d52860 100644
--- a/builtin/game/item.lua
+++ b/builtin/game/item.lua
@@ -243,7 +243,7 @@ function core.item_place_node(itemstack, placer, pointed_thing, param2,
if core.get_item_group(def.name, "attached_node") ~= 0 and
not builtin_shared.check_attached_node(place_to, newnode) then
log("action", "attached node " .. def.name ..
- " can not be placed at " .. core.pos_to_string(place_to))
+ " cannot be placed at " .. core.pos_to_string(place_to))
return itemstack, nil
end
diff --git a/builtin/game/item_entity.lua b/builtin/game/item_entity.lua
index f321bb1dd..1ca16a632 100644
--- a/builtin/game/item_entity.lua
+++ b/builtin/game/item_entity.lua
@@ -103,7 +103,7 @@ core.register_entity(":__builtin:item", {
try_merge_with = function(self, own_stack, object, entity)
if self.age == entity.age then
- -- Can not merge with itself
+ -- Cannot merge with itself
return false
end
@@ -113,7 +113,7 @@ core.register_entity(":__builtin:item", {
own_stack:get_meta() ~= stack:get_meta() or
own_stack:get_wear() ~= stack:get_wear() or
own_stack:get_free_space() == 0 then
- -- Can not merge different or full stack
+ -- Cannot merge different or full stack
return false
end
diff --git a/builtin/game/knockback.lua b/builtin/game/knockback.lua
index a937aa186..979d13a14 100644
--- a/builtin/game/knockback.lua
+++ b/builtin/game/knockback.lua
@@ -1,4 +1,4 @@
--- can be overriden by mods
+-- can be overridden by mods
function core.calculate_knockback(player, hitter, time_from_last_punch, tool_capabilities, dir, distance, damage)
if damage == 0 or player:get_armor_groups().immortal then
return 0.0
diff --git a/builtin/game/misc.lua b/builtin/game/misc.lua
index 997b1894a..fd0cacc8f 100644
--- a/builtin/game/misc.lua
+++ b/builtin/game/misc.lua
@@ -121,7 +121,7 @@ function core.get_player_radius_area(player_name, radius)
end
--- To be overriden by protection mods
+-- To be overridden by protection mods
function core.is_protected(pos, name)
return false