summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfaketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-03-04 15:09:35 +0100
committerfaketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-03-04 15:09:35 +0100
commitf1f762c4fa77e24a16ad4843cfd62ef636749155 (patch)
tree3d334c1fd95b7d229211b2630202e3bef91c3230
parentChanged signed char to unsigned char in block packets, so we can receive height up to 255 (diff)
downloadcuberite-f1f762c4fa77e24a16ad4843cfd62ef636749155.tar
cuberite-f1f762c4fa77e24a16ad4843cfd62ef636749155.tar.gz
cuberite-f1f762c4fa77e24a16ad4843cfd62ef636749155.tar.bz2
cuberite-f1f762c4fa77e24a16ad4843cfd62ef636749155.tar.lz
cuberite-f1f762c4fa77e24a16ad4843cfd62ef636749155.tar.xz
cuberite-f1f762c4fa77e24a16ad4843cfd62ef636749155.tar.zst
cuberite-f1f762c4fa77e24a16ad4843cfd62ef636749155.zip
-rw-r--r--Plugins/Core/onblockplace.lua2
-rw-r--r--settings.ini12
-rw-r--r--source/cChunk.cpp2
-rw-r--r--source/cChunk.h2
4 files changed, 12 insertions, 6 deletions
diff --git a/Plugins/Core/onblockplace.lua b/Plugins/Core/onblockplace.lua
index 64ab54920..5717d76ca 100644
--- a/Plugins/Core/onblockplace.lua
+++ b/Plugins/Core/onblockplace.lua
@@ -7,7 +7,7 @@ function OnBlockPlace( Block, Player )
local Y = Block.m_PosY
local Z = Block.m_PosZ
X, Y, Z = AddDirection( X, Y, Z, Block.m_Direction )
- if( Y >= 128 or Y < 0 ) then
+ if( Y >= 256 or Y < 0 ) then
return true
end
diff --git a/settings.ini b/settings.ini
index 7fd9b5809..b21997f32 100644
--- a/settings.ini
+++ b/settings.ini
@@ -4,11 +4,14 @@ MaxPlayers=10000
Description=MCServer - Slightly more custom!
[Worlds]
-DefaultWorld=world
;World=world_sexy
+DefaultWorld=world
[Plugins]
-;Squirrel=SquirrelChatLog
+NewPlugin=Core
+;NewPlugin=Protect
+;NewPlugin=MagicCarpet
+;NewPlugin=ChatLog
[HelpPlugin]
ShowPluginNames=1
@@ -16,6 +19,9 @@ ShowPluginNames=1
[Physics]
Water=0
+[Redstone]
+SimulateRedstone=0
+
[Monsters]
AnimalsOn=0
AnimalSpawnInterval=10
@@ -24,4 +30,4 @@ Types=Spider,Chicken,Cow,Pig,Sheep,Squid,Enderman,Zombiepigman,Cavespider,Creepe
[Authentication]
Server=session.minecraft.net
Address=/game/checkserver.jsp?user=%USERNAME%&serverId=%SERVERID%
-Authenticate=0
+Authenticate=0 \ No newline at end of file
diff --git a/source/cChunk.cpp b/source/cChunk.cpp
index a622a5148..fc26b380d 100644
--- a/source/cChunk.cpp
+++ b/source/cChunk.cpp
@@ -1041,7 +1041,7 @@ void cChunk::SendBlockTo( int a_X, int a_Y, int a_Z, cClientHandle* a_Client )
unsigned int index = MakeIndex( a_X, a_Y, a_Z );
cPacket_BlockChange BlockChange;
BlockChange.m_PosX = a_X + m_PosX*c_ChunkWidth;
- BlockChange.m_PosY = (char)(a_Y + m_PosY*c_ChunkHeight);
+ BlockChange.m_PosY = (unsigned char)(a_Y + m_PosY*c_ChunkHeight);
BlockChange.m_PosZ = a_Z + m_PosZ*c_ChunkWidth;
if( index != INDEX_OUT_OF_RANGE )
{
diff --git a/source/cChunk.h b/source/cChunk.h
index 0759b79f0..f2e623f6e 100644
--- a/source/cChunk.h
+++ b/source/cChunk.h
@@ -113,7 +113,7 @@ class cChunk
{
public:
static const int c_ChunkWidth = 16;
- static const int c_ChunkHeight = 128;
+ static const int c_ChunkHeight = 128; //256;
static const int c_NumBlocks = c_ChunkWidth * c_ChunkHeight * c_ChunkWidth;
static const int c_BlockDataSize = c_NumBlocks * 2 + (c_NumBlocks/2); // 2.5 * numblocks