Skip to content
This repository has been archived by the owner on Jun 9, 2023. It is now read-only.

Commit

Permalink
fix 2d particle, release v2.31
Browse files Browse the repository at this point in the history
  • Loading branch information
Redbeanw44602 committed Aug 29, 2021
1 parent 432aca8 commit 1e7d571
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 18 deletions.
11 changes: 9 additions & 2 deletions iland-core.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2936,8 +2936,14 @@ function Tcb_ButtomSign()
end
function Tcb_SelectionParticles()
for xuid,posarr in pairs(ArrayParticles) do
local Tpos = mc.getPlayer(xuid).blockPos
for n,pos in pairs(posarr) do
mc.runcmdEx('execute @a[name="'..GetIdFromXuid(xuid)..'"] ~ ~ ~ particle "'..cfg.features.particle_effects..'" '..pos.x..' '..tostring(pos.y+1.6)..' '..pos.z)
if newLand[xuid].dimension=='2D' then
posY = Tpos.y + 2
else
posY = pos.y + 1.6
end
mc.runcmdEx('execute @a[name="'..GetIdFromXuid(xuid)..'"] ~ ~ ~ particle "'..cfg.features.particle_effects..'" '..pos.x..' '..posY..' '..pos.z)
end
end
end
Expand Down Expand Up @@ -3172,7 +3178,7 @@ mc.listen('onServerStarted',function()
ILAPI.save()
end
if cfg.version==224 then
cfg.verison=230
cfg.version=230
cfg.features.disabled_listener = {}
cfg.features.blockLandDims = {}
cfg.features.nearby_protection = {
Expand All @@ -3198,6 +3204,7 @@ mc.listen('onServerStarted',function()
end
if cfg.version==230 then
cfg.version=231
cfg.verison=nil -- sb..
for landId,data in pairs(land_data) do
local perm = land_data[landId].permissions
if #perm~=49 then
Expand Down
2 changes: 1 addition & 1 deletion iland/config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 224,
"version": 230,
"update_check": true,
"manager": {
"default_language": "zh_CN",
Expand Down
23 changes: 12 additions & 11 deletions iland/lang/en_US.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"VERSION": 230,
"VERSION": 231,
"#1": "en_US Translation Contributor: Google Translate",

"gui.land.title": "Land v<a>",
Expand Down Expand Up @@ -28,7 +28,7 @@
"gui.general.cancel": "Cancel",
"gui.general.plzchose": "Please select",

"gui.landmgr.landinfo.content": "Owner: <a>\\nLandID: <b>\\nnickname: <c>\\n range: §l<d>§r <e> <f> -> <g>\\nLength/Width/Height: <h>/<i>/<j>\\nBottom Area: <k> Square Grid Volume: <l> Cube",
"gui.landmgr.landinfo.content": "Owner: <a>\\nLandID: <b>\\nnickname: <c>\\n range: §l<d>§r <e> <f> -> <g>\\nLength/Width/Height: <h>/<i>/<j>\\nBottom area: <k> Square grid volume: <l> Cubic grid",
"gui.landmgr.content": "Welcome to land manager",
"gui.landmgr.ctplus": "\nYou are now on §l<a>§r",
"gui.landmgr.unnamed": "Unnamed",
Expand Down Expand Up @@ -134,7 +134,7 @@
"gui.oplandmgr.features.particles": "Particle Special Effects",
"gui.oplandmgr.features.autochkupd": "Automatically check for updates (including online announcements)",
"gui.oplandmgr.features.forcetalk": "Force the territory to prompt to use the message form",
"gui.oplandmgr.features.seltolname": "Enclosure tool name (for specific selection tools, please use /land mgr selectool, here is just the configuration name)",
"gui.oplandmgr.features.seltolname": "Enclosure tool name (for specific selection tools, please use /land mgr selectool, here is only the configuration name)",
"gui.oplandmgr.features.frequency": "Reminder clock frequency (seconds)",
"gui.oplandmgr.features.playersperpage": "Number of players on the player selector page",
"gui.oplandmgr.features.chunksize": "chunk size (cell)",
Expand Down Expand Up @@ -171,7 +171,7 @@
"gui.buyland.unsupport": "This server does not currently support <a> Enclosure",
"gui.buyland.2d": "Two-dimensional territory",
"gui.buyland.3d": "Three-dimensional territory",
"gui.buyland.content": "Successful enclosure! \\nLength\\\\wide\\\\height: <a>\\\\<b>\\<c>cell\\n volume : <d>Block\\nPrice: <e><f>\\nWallet: <g><f>",
"gui.buyland.content": "Successful enclosure! \\nLength\\\\Width\\\\Height: <a>\\\\<b>\\<c>Grid\\n Volume : <d>Block\\nPrice: <e><f>\\nWallet: <g><f>",
"gui.buyland.succeed": "Successful purchase of the territory! Do you want to open the territory manager now?",
"gui.buyland.discount": "(Discounted <a>%%%%)",
"gui.delland.content": "Are you sure you want to delete your territory? \\nIf you are sure, you will get a <a><b> refund. Then your territory will lose its protection and the configuration file will be deleted immediately. ",
Expand All @@ -197,12 +197,12 @@
"gui.landcfg.inside.piston_push": "Allow piston push",
"gui.landcfg.inside.fire_spread": "Allow flame to spread",
"gui.landcfg.nearby": "§lNearby Events",
"gui.landtp.point": "Successfully set location [<a>] as territory <b>Teleport point. ",
"gui.landtp.point": "Successfully set location [<a>] as territory <b> The transfer point. ",
"gui.landtp.tip": "Please select the target territory to teleport",
"gui.landtp.trusted": "Trusted",

"gui.playerselector.title": "Player Selector",
"gui.playerselector.search.tip": "§lInstructions for use§r Select the player to be operated, multi-selection is supported. If there is no page, please choose to open the next page and submit.\nIf you use the search tool to enter the keyword Just submit it directly.",
"gui.playerselector.search.tip": "§lInstructions for use§r Select the player to be operated, multi-selection is supported. If there is no page, please choose to open the next page and submit.\nIf you use the search tool to enter keywords Just submit it directly.",
"gui.playerselector.search.tip2": "§lSearch Tool§r If there are too many players, you can use this tool to filter.",
"gui.playerselector.search.type": "Enter keywords:",
"gui.playerselector.search.ph": "[Not entered]",
Expand Down Expand Up @@ -242,7 +242,7 @@
"title.createorder.toosmall": "The enclosing territory is too small, please enclose it again.\n",
"title.createorder.toolow": "Three-dimensional enclosure, at least four grids in height.\n",
"title.createorder.failbystep": "The purchase failed! Please follow the steps to enclose the land!",
"title.createorder.collision": "The enclosure range conflicts with <a> (coordinates: <b>). Please make an enclosure again.\n",
"title.createorder.collision": "The enclosure range conflicts with <a> (coordinates: <b>), please enclose again.\n",
"title.landlimit.noperm": "This is the territory, you have no right to operate",
"title.landlimit.nearby": "The operation is cancelled because it is too close to another person's territory",
"title.landtp.fail.noland": "You need to stand on the territory first",
Expand All @@ -251,7 +251,7 @@
"title.landsign.visitorbuttom": "This is the territory of <a>",
"title.landtp.failbysame": "This territory has not yet set a teleportation point",
"title.landtp.plzset": "Please use /land point set first.",
"title.landtp.safetp": "The target teleportation point may cause suffocation and has stopped teleporting.",
"title.landtp.safetp": "The target teleport point may cause suffocation and has stopped teleporting.",

"sign.listener.ownertitle": "<a>",
"sign.listener.ownersubtitle": "Welcome back",
Expand Down Expand Up @@ -301,18 +301,19 @@
"console.update.newversion": "Get the new version <a>, you can use /land update to update automatically!",
"console.update.newcontent": "Update content:",
"console.update.force": "Sorry, due to cloud settings, your iLand must be updated <a> before it can be used. Forced updates are mostly enabled when there are serious problems with the old version.",
"console.update.disabled": "The cloud setting has disabled automatic updates, please update manually in time.",
"console.update.auto": "Because you have turned on automatic update, you are starting to update your iLand to a new version...",
"console.update.restart": "After the update is complete, the server needs to be restarted to take effect.",

"console.autoupdate.start": "Starting automatic update...",
"console.autoupdate.alreadylatest": "Update stopped because it is already the latest version (<a>).",
"console.autoupdate.download": "Downloading... ",
"console.autoupdate.errorbydown": "Failed to download file <a>, error code: <b>.Please check your network or report a problem, the update has been interrupted. ",
"console.autoupdate.errorbydown": "Failed to download file <a>, error code: <b>. Please check your network or report the problem, the update has been interrupted.",
"console.autoupdate.recoverbackup": "The backup has been restored, and the old version of iLand is being used.",
"console.autoupdate.errorbysha1": "The SHA1 verification of file <a> failed. Please check your network or report the problem. The update has been interrupted.",
"console.autoupdate.errorbyverify": "The verification of the file <a> failed. Please check your network or report the problem. The update has been interrupted.",
"console.autoupdate.success": "Automatic update has been completed, restart the server to take effect.",

"console.getonline.failbycode": "Failed to obtain network information, error code: <a>.",
"console.getonline.failbycode": "Failed to obtain networking information, error code: <a>.",
"console.getonline.failbyver": "The online information file version (<a>) that cannot be parsed. Your iLand may be out of date.",

"console.error.money.protocol": "Unknown economic component'<a>' is being used.",
Expand Down
9 changes: 5 additions & 4 deletions iland/lang/zh_TW.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"VERSION": 230,
"VERSION": 231,
"#1": "zh_CN 標準漢語翻譯貢獻者:RedbeanW",

"gui.land.title": "Land v<a>",
Expand Down Expand Up @@ -197,7 +197,7 @@
"gui.landcfg.inside.piston_push": "允許活塞推動",
"gui.landcfg.inside.fire_spread": "允許火焰蔓延",
"gui.landcfg.nearby": "§l附近事件",
"gui.landtp.point": "成功將位置 [<a>] 設定為領地 <b>的傳送點。 ",
"gui.landtp.point": "成功將位置 [<a>] 設定為領地 <b> 的傳送點。 ",
"gui.landtp.tip": "請選擇要傳送的目標領地",
"gui.landtp.trusted": "受信任",

Expand Down Expand Up @@ -301,15 +301,16 @@
"console.update.newversion": "獲取到到新版本 <a> ,可以使用 /land update 自動更新!",
"console.update.newcontent": "更新內容:",
"console.update.force": "抱歉,由於雲端設定,您的iLand必須更新倒 <a> 才可使用,強制更新大多在舊版本存在嚴重問題時才會啟用。",
"console.update.disabled": "雲端設定關閉了自動更新,請及時手動更新。",
"console.update.auto": "由於您開啟了自動更新,正在開始更新您的iLand到新版本...",
"console.update.restart": "更新完畢需要重啟服務器以生效。",

"console.autoupdate.start": "正在開始自動更新...",
"console.autoupdate.alreadylatest": "更新停止,因為已經是最新版本(<a>)。",
"console.autoupdate.download": "正在下載... ",
"console.autoupdate.errorbydown": "下載文件 <a> 失敗,錯誤代碼:<b>。請檢查您的網絡或反饋問題,更新已中斷。 ",
"console.autoupdate.errorbydown": "下載文件 <a> 失敗,錯誤代碼:<b>。請檢查您的網絡或反饋問題,更新已中斷。",
"console.autoupdate.recoverbackup": "已經恢復備份,正在使用舊版本iLand。",
"console.autoupdate.errorbysha1": "文件 <a> 的SHA1校驗失敗,請檢查您的網絡或反饋問題,更新已中斷。",
"console.autoupdate.errorbyverify": "文件 <a> 校驗失敗,請檢查您的網絡或反饋問題,更新已中斷。",
"console.autoupdate.success": "自動更新已完成,重啟服務器即可生效。",

"console.getonline.failbycode": "獲取聯網信息失敗,錯誤代碼:<a>。",
Expand Down

0 comments on commit 1e7d571

Please sign in to comment.