-
Notifications
You must be signed in to change notification settings - Fork 52
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
Worldedit Selections (optional) #15
Open
pickardjoe
wants to merge
11
commits into
minetest-mods:master
Choose a base branch
from
pickardjoe:worldedit
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
d3b91a2
Added optional worldedit dependency and used it for selection.
pickardjoe e1e83c7
Merge branch 'master' of https://github.com/ShadowNinja/areas
pickardjoe 7a400bb
Fixed useWorldedit function.
pickardjoe 2dc928a
c2fafce
6bba3ad
f77d774
Fix problem with setting worldedit selection.
pickardjoe 609ad76
Fixed a typo.
pickardjoe 79821b0
Added optional support for using worledit for selections.
pickardjoe a7df700
Removed semicolons.
pickardjoe e93e5c0
Merge branch 'worldedit_dev' into worldedit
pickardjoe 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
worldedit? |
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 |
---|---|---|
|
@@ -118,25 +118,52 @@ minetest.register_chatcommand("area_pos", { | |
end, | ||
}) | ||
|
||
function areas.useWorldedit(playerName) | ||
if worldedit then | ||
if nil == playerName 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.
|
||
return true; | ||
elseif minetest.check_player_privs(playerName, {worldedit = true}) then | ||
return true; | ||
end | ||
end | ||
return false; | ||
end | ||
|
||
function areas:getPos(playerName) | ||
local pos1, pos2 = areas.pos1[playerName], areas.pos2[playerName] | ||
if not (pos1 and pos2) then | ||
return nil | ||
end | ||
-- Copy positions so that the area table doesn't contain multiple | ||
-- references to the same position. | ||
pos1, pos2 = vector.new(pos1), vector.new(pos2) | ||
return areas:sortPos(pos1, pos2) | ||
local pos1, pos2 = nil, nil; | ||
if areas.useWorldedit(playerName) then | ||
pos1, pos2 = worldedit.pos1[playerName], worldedit.pos2[playerName]; | ||
else | ||
pos1, pos2 = areas.pos1[playerName], areas.pos2[playerName]; | ||
end | ||
|
||
if not (pos1 and pos2) then | ||
return nil | ||
end | ||
-- Copy positions so that the area table doesn't contain multiple | ||
-- references to the same position. | ||
pos1, pos2 = vector.new(pos1), vector.new(pos2) | ||
return areas:sortPos(pos1, pos2) | ||
end | ||
|
||
function areas:setPos1(playerName, pos) | ||
areas.pos1[playerName] = pos | ||
areas.markPos1(playerName) | ||
if areas.useWorldedit(playerName) then | ||
worldedit.pos1[playerName] = pos; | ||
worldedit.mark_pos1(playerName); | ||
else | ||
areas.pos1[playerName] = pos | ||
areas.markPos1(playerName) | ||
end | ||
end | ||
|
||
function areas:setPos2(playerName, pos) | ||
areas.pos2[playerName] = pos | ||
areas.markPos2(playerName) | ||
if areas.useWorldedit(playerName) then | ||
worldedit.pos2[playerName] = pos; | ||
worldedit.mark_pos2(playerName); | ||
else | ||
areas.pos2[playerName] = pos | ||
areas.markPos2(playerName) | ||
end | ||
end | ||
|
||
|
||
|
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.
Throws a warning if WorldEdit isn't installed.