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

Dispensers can spawn mobs

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1106 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
luksor111@gmail.com 2012-12-26 18:15:11 +00:00
parent 575abe8691
commit b026dc3034
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source/DispenserEntity.cpp
View File

@ -101,8 +101,9 @@ void cDispenserEntity::Dispense()
if(SlotsCnt > 0) if(SlotsCnt > 0)
{ {
MTRand r1; MTRand r1;
cItem Drop = m_Items[OccupiedSlots[r1.randInt() % SlotsCnt]]; char RandomSlot = r1.randInt() % SlotsCnt;
switch( m_Items[OccupiedSlots[r1.randInt() % SlotsCnt]].m_ItemType ) cItem Drop = m_Items[OccupiedSlots[RandomSlot]];
switch( m_Items[OccupiedSlots[RandomSlot]].m_ItemType )
{ {
case E_ITEM_BUCKET: case E_ITEM_BUCKET:
{ {
@ -110,19 +111,19 @@ void cDispenserEntity::Dispense()
if( DispBlock == E_BLOCK_STATIONARY_WATER ) if( DispBlock == E_BLOCK_STATIONARY_WATER )
{ {
m_World->SetBlock( Disp_X, Disp_Y, Disp_Z, E_BLOCK_AIR, 0 ); m_World->SetBlock( Disp_X, Disp_Y, Disp_Z, E_BLOCK_AIR, 0 );
m_Items[OccupiedSlots[r1.randInt() % SlotsCnt]].m_ItemType = E_ITEM_WATER_BUCKET; m_Items[OccupiedSlots[RandomSlot]].m_ItemType = E_ITEM_WATER_BUCKET;
} }
else if( DispBlock == E_BLOCK_STATIONARY_LAVA ) else if( DispBlock == E_BLOCK_STATIONARY_LAVA )
{ {
m_World->SetBlock( Disp_X, Disp_Y, Disp_Z, E_BLOCK_AIR, 0 ); m_World->SetBlock( Disp_X, Disp_Y, Disp_Z, E_BLOCK_AIR, 0 );
m_Items[OccupiedSlots[r1.randInt() % SlotsCnt]].m_ItemType = E_ITEM_LAVA_BUCKET; m_Items[OccupiedSlots[RandomSlot]].m_ItemType = E_ITEM_LAVA_BUCKET;
} }
else else
{ {
cItems Pickups; cItems Pickups;
Pickups.push_back(cItem(Drop.m_ItemType, 1, Drop.m_ItemHealth)); Pickups.push_back(cItem(Drop.m_ItemType, 1, Drop.m_ItemHealth));
m_World->SpawnItemPickups(Pickups, Disp_X, Disp_Y, Disp_Z); m_World->SpawnItemPickups(Pickups, Disp_X, Disp_Y, Disp_Z);
m_Items[OccupiedSlots[r1.randInt() % SlotsCnt]].m_ItemCount--; m_Items[OccupiedSlots[RandomSlot]].m_ItemCount--;
} }
break; break;
} }
@ -132,14 +133,14 @@ void cDispenserEntity::Dispense()
if( DispBlock == E_BLOCK_AIR || IsBlockLiquid(DispBlock) || cFluidSimulator::CanWashAway(DispBlock) ) if( DispBlock == E_BLOCK_AIR || IsBlockLiquid(DispBlock) || cFluidSimulator::CanWashAway(DispBlock) )
{ {
m_World->SetBlock( Disp_X, Disp_Y, Disp_Z, E_BLOCK_STATIONARY_WATER, 0 ); m_World->SetBlock( Disp_X, Disp_Y, Disp_Z, E_BLOCK_STATIONARY_WATER, 0 );
m_Items[OccupiedSlots[r1.randInt() % SlotsCnt]].m_ItemType = E_ITEM_BUCKET; m_Items[OccupiedSlots[RandomSlot]].m_ItemType = E_ITEM_BUCKET;
} }
else else
{ {
cItems Pickups; cItems Pickups;
Pickups.push_back(cItem(Drop.m_ItemType, 1, Drop.m_ItemHealth)); Pickups.push_back(cItem(Drop.m_ItemType, 1, Drop.m_ItemHealth));
m_World->SpawnItemPickups(Pickups, Disp_X, Disp_Y, Disp_Z); m_World->SpawnItemPickups(Pickups, Disp_X, Disp_Y, Disp_Z);
m_Items[OccupiedSlots[r1.randInt() % SlotsCnt]].m_ItemCount--; m_Items[OccupiedSlots[RandomSlot]].m_ItemCount--;
} }
break; break;
} }
@ -149,14 +150,22 @@ void cDispenserEntity::Dispense()
if( DispBlock == E_BLOCK_AIR || IsBlockLiquid(DispBlock) || cFluidSimulator::CanWashAway(DispBlock) ) if( DispBlock == E_BLOCK_AIR || IsBlockLiquid(DispBlock) || cFluidSimulator::CanWashAway(DispBlock) )
{ {
m_World->SetBlock( Disp_X, Disp_Y, Disp_Z, E_BLOCK_STATIONARY_LAVA, 0 ); m_World->SetBlock( Disp_X, Disp_Y, Disp_Z, E_BLOCK_STATIONARY_LAVA, 0 );
m_Items[OccupiedSlots[r1.randInt() % SlotsCnt]].m_ItemType = E_ITEM_BUCKET; m_Items[OccupiedSlots[RandomSlot]].m_ItemType = E_ITEM_BUCKET;
} }
else else
{ {
cItems Pickups; cItems Pickups;
Pickups.push_back(cItem(Drop.m_ItemType, 1, Drop.m_ItemHealth)); Pickups.push_back(cItem(Drop.m_ItemType, 1, Drop.m_ItemHealth));
m_World->SpawnItemPickups(Pickups, Disp_X, Disp_Y, Disp_Z); m_World->SpawnItemPickups(Pickups, Disp_X, Disp_Y, Disp_Z);
m_Items[OccupiedSlots[r1.randInt() % SlotsCnt]].m_ItemCount--; m_Items[OccupiedSlots[RandomSlot]].m_ItemCount--;
}
break;
}
case E_ITEM_SPAWN_EGG:
{
if (m_World->SpawnMob(Disp_X + 0.5, Disp_Y, Disp_Z + 0.5, m_Items[OccupiedSlots[RandomSlot]].m_ItemDamage) >= 0)
{
m_Items[OccupiedSlots[RandomSlot]].m_ItemCount--;
} }
break; break;
} }
@ -165,7 +174,7 @@ void cDispenserEntity::Dispense()
cItems Pickups; cItems Pickups;
Pickups.push_back(cItem(Drop.m_ItemType, 1, Drop.m_ItemHealth)); Pickups.push_back(cItem(Drop.m_ItemType, 1, Drop.m_ItemHealth));
m_World->SpawnItemPickups(Pickups, Disp_X, Disp_Y, Disp_Z); m_World->SpawnItemPickups(Pickups, Disp_X, Disp_Y, Disp_Z);
m_Items[OccupiedSlots[r1.randInt() % SlotsCnt]].m_ItemCount--; m_Items[OccupiedSlots[RandomSlot]].m_ItemCount--;
break; break;
} }
} }