flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

MCServer to Cuberite

Browse Source
This commit is contained in:
Mathias 2016-01-29 21:47:00 +02:00
parent d9e4eaa2a6
commit 752d99c8b8
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -21,10 +21,10 @@ Luksor
M10360
marmot21
Masy98
mathias-github
mborland
mgueydan
MikeHunsinger
missingchar (mathias-github)
mtilden
nesco
NiLSPACE (formerly STR_Warrior)

2
Server/Plugins/APIDump/APIDesc.lua
View File

@ -662,7 +662,7 @@ function OnPlayerJoined(a_Player)
-- Send an example composite chat message to the player:
a_Player:SendMessage(cCompositeChat()
:AddTextPart("Hello, ")
:AddUrlPart(a_Player:GetName(), "http://www.mc-server.org", "u@2") -- Colored underlined link
:AddUrlPart(a_Player:GetName(), "http://cuberite.org", "u@2") -- Colored underlined link
:AddSuggestCommandPart(", and welcome.", "/help", "u") -- Underlined suggest-command
:AddRunCommandPart(" SetDay", "/time set 0") -- Regular text that will execute command when clicked
:SetMessageType(mtJoin) -- It is a join-message

4
Server/Plugins/APIDump/InfoFile.html
View File

@ -234,8 +234,8 @@ RegisterPluginInfoConsoleCommands()
<p>There are several plugins that already implement this approach. You can visit them for inspiration and to see what the generated documentation looks like:</p>
<ul>
<li>Gallery plugin: <a href="https://github.com/mc-server/Gallery/blob/master/Info.lua">Info.lua</a>, <a href="http://forum.mc-server.org/showthread.php?tid=1306">Forum</a> documentation</li>
<li>WorldEdit plugin: <a href="https://github.com/mc-server/WorldEdit/blob/master/Info.lua">Info.lua</a>, <a href="http://forum.mc-server.org/showthread.php?tid=870">Forum</a> and <a href="https://github.com/mc-server/WorldEdit">MarkDown</a> documentation</li>
<li>Gallery plugin: <a href="https://github.com/cuberite/gallery/blob/master/Info.lua">Info.lua</a>, <a href="http://forum.mc-server.org/showthread.php?tid=1306">Forum</a> documentation</li>
<li>WorldEdit plugin: <a href="https://github.com/cuberite/WorldEdit/blob/master/Info.lua">Info.lua</a>, <a href="http://forum.mc-server.org/showthread.php?tid=870">Forum</a> and <a href="https://github.com/cuberite/WorldEdit">MarkDown</a> documentation</li>
</ul>
<script>

2
Server/Plugins/Debuggers/Debuggers.lua
View File

@ -1557,7 +1557,7 @@ function OnPlayerJoined(a_Player)
-- Test composite chat chaining:
a_Player:SendMessage(cCompositeChat()
:AddTextPart("Hello, ")
:AddUrlPart(a_Player:GetName(), "http://www.mc-server.org", "u@2")
:AddUrlPart(a_Player:GetName(), "http://cuberite.org", "u@2")
:AddSuggestCommandPart(", and welcome.", "/help", "u")
:AddRunCommandPart(" SetDay", "/time set 0")
)

2
docs/Generator.html
View File

@ -503,7 +503,7 @@ there should be more lava springs and almost no water springs near the bottom. T
Cuberite team has made a tool that scanned through MineCraft's terrain and counted the amount of both types
of springs in relation to their height. Two curves have been found for the distribution of each type of the
spring:</p>
<img src="http://mc-server.xoft.cz/img/vanilla_springs_huge.png" />
<img src="img/vanilla_springs_huge.png" />
<p>Cuberite uses an approximation of the above curves to choose the height at which to generate the
spring.</p>

BIN
docs/img/vanilla_springs_huge.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

2
src/WorldStorage/WSSAnvil.cpp
View File

@ -982,7 +982,7 @@ cBlockEntity * cWSSAnvil::LoadChestFromNBT(const cParsedNBT & a_NBT, int a_TagId
// Check if the data has a proper type:
// TODO: Does vanilla use "TrappedChest" or not? MCWiki says no, but previous code says yes
// Ref.: http://minecraft.gamepedia.com/Trapped_Chest
// https://github.com/mc-server/MCServer/blob/d0551e2e0a98a28f31a88d489d17b408e4a7d38d/src/WorldStorage/WSSAnvil.cpp#L637
// https://github.com/cuberite/cuberite/blob/d0551e2e0a98a28f31a88d489d17b408e4a7d38d/src/WorldStorage/WSSAnvil.cpp#L637
if (!CheckBlockEntityType(a_NBT, a_TagIdx, "Chest") && !CheckBlockEntityType(a_NBT, a_TagIdx, "TrappedChest"))
{
return nullptr;