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

Merge branch 'master' of https://github.com/mc-server/MCServer

Browse Source
This commit is contained in:
r.ramazanov 2014-04-24 10:32:26 +04:00
commit d126adc124
4 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -699,7 +699,7 @@ end</pre>
GetLevel = { Params = "EnchantmentNumID", Return = "number", Notes = "Returns the level of the specified enchantment stored in this object; 0 if not stored" },
IsEmpty = { Params = "", Return = "bool", Notes = "Returns true if the object stores no enchantments" },
SetLevel = { Params = "EnchantmentNumID, Level", Return = "", Notes = "Sets the level for the specified enchantment, adding it if not stored before or removing it if level < = 0" },
StringToEnchantmentID = { Params = "EnchantmentTextID", Return = "number", Notes = "(static) Returns the enchantment numerical ID, -1 if not understood. Case insensitive" },
StringToEnchantmentID = { Params = "EnchantmentTextID", Return = "number", Notes = "(static) Returns the enchantment numerical ID, -1 if not understood. Case insensitive. Also understands plain numbers." },
ToString = { Params = "", Return = "string", Notes = "Returns the string description of all the enchantments stored in this object, in numerical-ID form" },
},
Constants =

1
src/Blocks/BlockLeaves.h
View File

@ -16,6 +16,7 @@
{ \
case E_BLOCK_LEAVES: a_Area.SetBlockType(x, y, z, (BLOCKTYPE)(E_BLOCK_SPONGE + i + 1)); break; \
case E_BLOCK_LOG: return true; \
case E_BLOCK_NEW_LEAVES: a_Area.SetBlockType(x, y, z, (BLOCKTYPE)(E_BLOCK_SPONGE + i + 1)); break; \
case E_BLOCK_NEW_LOG: return true; \
}

2
src/Enchantments.h
View File

@ -99,7 +99,7 @@ public:
/** Returns true if there are no enchantments */
bool IsEmpty(void) const;
/** Converts enchantment name to the numeric representation; returns -1 if enchantment name not found; case insensitive */
/** Converts enchantment name or ID (number in string) to the numeric representation; returns -1 if enchantment name not found; case insensitive */
static int StringToEnchantmentID(const AString & a_EnchantmentName);
/** Returns true if a_Other contains exactly the same enchantments and levels */

36
src/Generating/Prefabs/NetherFortPrefabs.cpp
View File

@ -439,11 +439,11 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
// The data has been exported from the gallery Nether, area index 20, ID 162, created by STR_Warrior
{
// Size:
14, 9, 7, // SizeX = 14, SizeY = 9, SizeZ = 7
14, 11, 7, // SizeX = 14, SizeY = 11, SizeZ = 7
// Hitbox (relative to bounding box):
0, 0, 0, // MinX, MinY, MinZ
13, 18, 6, // MaxX, MaxY, MaxZ
13, 20, 6, // MaxX, MaxY, MaxZ
// Block definitions:
".: 0: 0\n" /* air */
@ -552,11 +552,33 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/* * 01234567890123 */
/* 0 */ "mmmmmmmmhhhhhm"
/* 1 */ "mmmmmmhhh...hh"
/* 2 */ ".............h"
/* 3 */ ".............h"
/* 4 */ ".............h"
/* 2 */ "mm...........h"
/* 3 */ "mm...........h"
/* 4 */ "mm...........h"
/* 5 */ "mmmmmmhhh...hh"
/* 6 */ "mmmmmmmmhhhhhm",
/* 6 */ "mmmmmmmmhhhhhm"
// Level 9
/* z\x* 1111 */
/* * 01234567890123 */
/* 0 */ "mmmmmmmm.....m"
/* 1 */ "mmmmmm........"
/* 2 */ "mmmm.........."
/* 3 */ "mmmm.........."
/* 4 */ "mmmm.........."
/* 5 */ "mmmmmm........"
/* 6 */ "mmmmmmmm.....m"
// Level 10
/* z\x* 1111 */
/* * 01234567890123 */
/* 0 */ "mmmmmmmm.....m"
/* 1 */ "mmmmmm........"
/* 2 */ "mmmmmm........"
/* 3 */ "mmmmmm........"
/* 4 */ "mmmmmm........"
/* 5 */ "mmmmmm........"
/* 6 */ "mmmmmmmm.....m",
// Connectors:
"0: 0, 5, 3: 4\n" /* Type 0, direction X- */,
@ -3030,7 +3052,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
false,
// DefaultWeight:
250,
1000,
// DepthWeight:
"0:0|2:0|4:0|6:0|8:0|10:0|12:0|14:0|16:0|18:0",