-
Notifications
You must be signed in to change notification settings - Fork 26
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Way to make drawers public! (tested on area mod) #67
Closed
Emojigit
wants to merge
2
commits into
minetest-mods:master
from
C-C-Minetest-Server:fork-20211230-public-upgrade
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -153,7 +153,19 @@ core.register_entity("drawers:visual", { | |||||
end, | ||||||
|
||||||
on_rightclick = function(self, clicker) | ||||||
if core.is_protected(self.drawer_pos, clicker:get_player_name()) then | ||||||
local upgrades = core.get_meta(self.drawer_pos):get_inventory():get_list("upgrades") | ||||||
|
||||||
local private = true | ||||||
for _,itemStack in pairs(upgrades) do | ||||||
local iname = itemStack:get_name() | ||||||
local idef = core.registered_items[iname] | ||||||
if idef.groups.drawer_public == 1 then | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
private = false | ||||||
break | ||||||
end | ||||||
end | ||||||
|
||||||
if private and core.is_protected(self.drawer_pos, clicker:get_player_name()) then | ||||||
core.record_protection_violation(self.drawer_pos, clicker:get_player_name()) | ||||||
return | ||||||
end | ||||||
|
@@ -209,14 +221,28 @@ core.register_entity("drawers:visual", { | |||||
end, | ||||||
|
||||||
on_punch = function(self, puncher, time_from_last_punch, tool_capabilities, dir) | ||||||
local node = minetest.get_node(self.object:get_pos()) | ||||||
local pos = self.object:get_pos() | ||||||
local node = minetest.get_node(pos) | ||||||
|
||||||
if core.get_item_group(node.name, "drawer") == 0 then | ||||||
self.object:remove() | ||||||
return | ||||||
end | ||||||
|
||||||
local upgrades = core.get_meta(pos):get_inventory():get_list("upgrades") | ||||||
|
||||||
local private = true | ||||||
for _,itemStack in pairs(upgrades) do | ||||||
local iname = itemStack:get_name() | ||||||
local idef = core.registered_items[iname] | ||||||
if idef.groups.drawer_public == 1 then | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
private = false | ||||||
break | ||||||
end | ||||||
end | ||||||
|
||||||
local add_stack = not puncher:get_player_control().sneak | ||||||
if core.is_protected(self.drawer_pos, puncher:get_player_name()) then | ||||||
if private and core.is_protected(self.drawer_pos, puncher:get_player_name()) then | ||||||
core.record_protection_violation(self.drawer_pos, puncher:get_player_name()) | ||||||
return | ||||||
end | ||||||
|
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
idef
might benil
when items are removed from the game. This is an edge-case, but yet a potential bug.Also I suggest to move all protection checks to a local function so that
on_rightclick
andon_punch
use the identical checks.