Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
homedecor_modpack
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Illuna-Minetest
homedecor_modpack
Commits
d18bee7f
Commit
d18bee7f
authored
8 years ago
by
frodon1
Committed by
Gilles DAVID
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix calls to check_player_privs with player name instead of player userdata
Fixes #357
parent
c05378f2
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
homedecor/handlers/inventory.lua
+3
-3
3 additions, 3 deletions
homedecor/handlers/inventory.lua
inbox/init.lua
+2
-2
2 additions, 2 deletions
inbox/init.lua
itemframes/init.lua
+14
-10
14 additions, 10 deletions
itemframes/init.lua
with
19 additions
and
15 deletions
homedecor/handlers/inventory.lua
+
3
−
3
View file @
d18bee7f
...
...
@@ -119,7 +119,7 @@ function homedecor.handle_inventory(name, def, original_def)
local
playername
=
player
:
get_player_name
()
if
playername
==
owner
or
minetest
.
check_player_privs
(
player
,
"protection_bypass"
)
then
minetest
.
check_player_privs
(
player
name
,
"protection_bypass"
)
then
return
allow_move
and
allow_move
(
pos
,
from_list
,
from_index
,
to_list
,
to_index
,
count
,
player
)
or
count
...
...
@@ -138,7 +138,7 @@ function homedecor.handle_inventory(name, def, original_def)
local
playername
=
player
:
get_player_name
()
if
playername
==
owner
or
minetest
.
check_player_privs
(
player
,
"protection_bypass"
)
then
minetest
.
check_player_privs
(
player
name
,
"protection_bypass"
)
then
return
allow_put
and
allow_put
(
pos
,
listname
,
index
,
stack
,
player
)
or
stack
:
get_count
()
end
...
...
@@ -156,7 +156,7 @@ function homedecor.handle_inventory(name, def, original_def)
local
playername
=
player
:
get_player_name
()
if
playername
==
owner
or
minetest
.
check_player_privs
(
player
,
"protection_bypass"
)
then
minetest
.
check_player_privs
(
player
name
,
"protection_bypass"
)
then
return
allow_take
and
allow_take
(
pos
,
listname
,
index
,
stack
,
player
)
or
stack
:
get_count
()
end
...
...
This diff is collapsed.
Click to expand it.
inbox/init.lua
+
2
−
2
View file @
d18bee7f
...
...
@@ -52,12 +52,12 @@ minetest.register_node("inbox:empty", {
minetest
.
check_player_privs
(
player
,
"protection_bypass"
)
and
clicker
:
get_player_control
().
aux1
then
minetest
.
show_formspec
(
clicker
:
get_player_name
()
,
player
,
"inbox:mailbox"
,
inbox
.
get_inbox_formspec
(
pos
))
else
minetest
.
show_formspec
(
clicker
:
get_player_name
()
,
player
,
"inbox:mailbox"
,
inbox
.
get_inbox_insert_formspec
(
pos
))
end
...
...
This diff is collapsed.
Click to expand it.
itemframes/init.lua
+
14
−
10
View file @
d18bee7f
...
...
@@ -129,8 +129,9 @@ minetest.register_node("itemframes:frame",{
on_rightclick
=
function
(
pos
,
node
,
clicker
,
itemstack
)
if
not
itemstack
then
return
end
local
meta
=
minetest
.
get_meta
(
pos
)
if
clicker
:
get_player_name
()
==
meta
:
get_string
(
"owner"
)
or
minetest
.
check_player_privs
(
clicker
,
"protection_bypass"
)
then
local
name
=
clicker
and
clicker
:
get_player_name
()
if
name
==
meta
:
get_string
(
"owner"
)
or
minetest
.
check_player_privs
(
name
,
"protection_bypass"
)
then
drop_item
(
pos
,
node
)
local
s
=
itemstack
:
take_item
()
meta
:
set_string
(
"item"
,
s
:
to_string
())
...
...
@@ -140,8 +141,9 @@ minetest.register_node("itemframes:frame",{
end
,
on_punch
=
function
(
pos
,
node
,
puncher
)
local
meta
=
minetest
.
get_meta
(
pos
)
if
puncher
:
get_player_name
()
==
meta
:
get_string
(
"owner"
)
or
minetest
.
check_player_privs
(
puncher
,
"protection_bypass"
)
then
local
name
=
puncher
and
puncher
:
get_player_name
()
if
name
==
meta
:
get_string
(
"owner"
)
or
minetest
.
check_player_privs
(
name
,
"protection_bypass"
)
then
drop_item
(
pos
,
node
)
end
end
,
...
...
@@ -150,7 +152,7 @@ minetest.register_node("itemframes:frame",{
local
name
=
player
and
player
:
get_player_name
()
local
meta
=
minetest
.
get_meta
(
pos
)
return
name
==
meta
:
get_string
(
"owner"
)
or
minetest
.
check_player_privs
(
player
,
"protection_bypass"
)
minetest
.
check_player_privs
(
name
,
"protection_bypass"
)
end
,
on_destruct
=
function
(
pos
)
local
meta
=
minetest
.
get_meta
(
pos
)
...
...
@@ -190,8 +192,9 @@ minetest.register_node("itemframes:pedestal",{
on_rightclick
=
function
(
pos
,
node
,
clicker
,
itemstack
)
if
not
itemstack
then
return
end
local
meta
=
minetest
.
get_meta
(
pos
)
if
clicker
:
get_player_name
()
==
meta
:
get_string
(
"owner"
)
or
minetest
.
check_player_privs
(
clicker
,
"protection_bypass"
)
then
local
name
=
clicker
and
clicker
:
get_player_name
()
if
name
==
meta
:
get_string
(
"owner"
)
or
minetest
.
check_player_privs
(
name
,
"protection_bypass"
)
then
drop_item
(
pos
,
node
)
local
s
=
itemstack
:
take_item
()
meta
:
set_string
(
"item"
,
s
:
to_string
())
...
...
@@ -201,8 +204,9 @@ minetest.register_node("itemframes:pedestal",{
end
,
on_punch
=
function
(
pos
,
node
,
puncher
)
local
meta
=
minetest
.
get_meta
(
pos
)
if
puncher
:
get_player_name
()
==
meta
:
get_string
(
"owner"
)
or
minetest
.
check_player_privs
(
puncher
,
"protection_bypass"
)
then
local
name
=
puncher
and
puncher
:
get_player_name
()
if
name
==
meta
:
get_string
(
"owner"
)
or
minetest
.
check_player_privs
(
name
,
"protection_bypass"
)
then
drop_item
(
pos
,
node
)
end
end
,
...
...
@@ -211,7 +215,7 @@ minetest.register_node("itemframes:pedestal",{
local
name
=
player
and
player
:
get_player_name
()
local
meta
=
minetest
.
get_meta
(
pos
)
return
name
==
meta
:
get_string
(
"owner"
)
or
minetest
.
check_player_privs
(
player
,
"protection_bypass"
)
minetest
.
check_player_privs
(
name
,
"protection_bypass"
)
end
,
on_destruct
=
function
(
pos
)
local
meta
=
minetest
.
get_meta
(
pos
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment