1
0
Commit Graph

138 Commits

Author SHA1 Message Date
madmaxoft
641a1286c1 Fixed torch placement.
This is related to #127, but until we know more about the change, I'm not closing the issue.
2013-09-08 22:40:50 +02:00
madmaxoft
d31142811d Merged branch 'Projectiles'. 2013-09-07 22:06:30 +02:00
madmaxoft
3b1c83acf8 Renamed cWorld::DoExplosiontAt() to cWorld::DoExplosionAt() 2013-09-07 18:12:22 +02:00
Tiger Wang
9c22cf1520 Fixed inconsistent meta naming 2013-09-03 12:33:54 +01:00
Tiger Wang
20b64e18e4 Merge remote-tracking branch 'upstream/master'
Conflicts:
	source/Bindings.cpp
	source/Entities/Entity.cpp

Updated from upsteam
2013-09-02 14:15:28 +01:00
Tiger Wang
7056992d0d Implemented xoft's suggestions [SEE DESC]
Rail metas are  now in BlockID and exported to LUA
Minecart now does a SetMass, instead of m_Mass
Minecarts use SubType instead of TypeType
2013-08-29 13:47:22 +01:00
madmaxoft
104a31e23d Merging in tigerw's changes from PR #118 2013-08-25 16:11:19 +02:00
Tiger Wang
55e3fc53f6 Fixed iron door opening by hand 2013-08-25 13:41:02 +01:00
Tiger Wang
11ca2f96a0 Vines now spread when updated 2013-08-24 22:00:24 +01:00
Tiger Wang
d1cc6d9a9c Added comments and fixed a bug
Bug was placing slabs between slabs not making a double slab.
2013-08-24 18:46:19 +01:00
Tiger Wang
8f2181bfbe Fixed incorrect double slab drops 2013-08-23 20:12:21 +01:00
Tiger Wang
a671e45cd5 Double slabs work *choke choke* 2013-08-23 19:38:39 +01:00
Tiger Wang
0c44904766 Changed comments to be more accurate 2013-08-20 23:24:29 +01:00
Tiger Wang
8e153f6689 Fixed longstanding issue with slabs
Fixes FS#298
2013-08-20 23:17:49 +01:00
Tiger Wang
b35771ca0d Fixed broken carpet handler [SEE DESC]
Made BlockHandler pass on control to carpet handler
Declared thinggummies in carpet handler
Fixed carpet block pushback using incorrect format
2013-08-20 22:47:10 +01:00
Tiger Wang
148d4e9b80 Activator rail now uses rail handler 2013-08-20 20:15:46 +01:00
madmaxoft
1a7912744f Moved entities into the Entities subfolder. 2013-08-19 11:39:13 +02:00
Tiger Wang
303b1a9c45 Buncha bugfixes [SEE DESC]
Fixed generation values not being written
Fixed piston being able to push water
Fixed ice creating a non-source block (still doesn't update though)
Removed problematic piston code
2013-08-14 11:44:02 +01:00
Tiger Wang
23a5fb1450 Removed more comments 2013-08-13 16:36:19 +01:00
STRWarrior
83d3635e0b Added quartz stairs. 2013-08-12 02:31:02 -07:00
Tiger Wang
b48651a034 Really removed comments this time 2013-08-11 21:08:20 +01:00
Tiger Wang
93f5a4388c Removed unneeded case clause 2013-08-11 15:21:31 +01:00
Tiger Wang
e7ecd78312 Tried adding bracket 2013-08-11 12:08:09 +01:00
Tiger Wang
baae26ab22 Further attempt at fixing torch placements
Also fixed block on flower placement. #71
2013-08-11 11:58:57 +01:00
Tiger Wang
7e288850b1 Attempt at fixing torch placement
Attempt at fixing #71 and placement of torches.
2013-08-10 21:32:50 +01:00
madmaxoft
d3c29c5a88 Piston head, when removed, removes the associated piston body, too.
Fixes FS 388
2013-08-10 08:22:53 +02:00
madmaxoft
d4a3c451c4 Added OnExploding() and OnExploded() hooks.
As requested in FS 413, with extra parameters:
World, BlockX, BlockY, BlockZ, Size, CanCauseFire, Source, SourceData

OnExploding() can return 3 values:
StopHook, CanCauseFire, ExplosionSize
2013-08-09 14:58:43 +02:00
madmaxoft
073bcd0361 Added the Carpet block. 2013-08-05 10:43:43 +02:00
madmaxoft
9efcd5b82f Added the "Edit Sign" packet sent to the client placing a sign.
Fixes issue #20. The 1.6.2 client wouldn't open the sign editor UI unless it receives a special packet
2013-07-29 21:42:05 +02:00
Alexander Harkness
53e22b1185 Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
madmaxoft@gmail.com
547c341325 TNT fixes.
Other blocks can be placed next to TNT.
Explosions activate nearby TNT blocks.
TNT doesn't destroy bedrock, obsidian and liquid blocks.
Server doesn't crash when a TNT (or other entity) leaves the valid Y range.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1603 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-18 08:24:34 +00:00
nielsbreu@gmail.com
9dfff6810c Fixed compilation on linux.
Any idea why SendMessageA works on Windows and not on linux?

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1595 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-15 18:26:00 +00:00
nielsbreu@gmail.com
f3319c4d5f You can only sleep when the time is day, and beds explode if the dimension is not Overworld.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1592 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-15 17:10:34 +00:00
madmaxoft@gmail.com
007e75de9d Implemented the Hopper block handler
Hoppers can be placed properly, but won't work yet.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1583 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-12 08:22:34 +00:00
faketruth
3370773c4b Fixed 2 more tabs...
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1571 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-09 16:18:18 +00:00
faketruth
7a6aa5c127 Converted spaces to tabs
Dead bush does not drop pickups when invalidly placed

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1570 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-09 16:17:03 +00:00
faketruth
3ccba12e39 Added dead bush block handler so a dead bush pickup is dropped when the sand underneath it is removed.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1569 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-09 15:16:07 +00:00
madmaxoft@gmail.com
3ee5236284 Removed cLadder, cSign, cStairs, cTorch and cVine classes, moved their functionality into the appropriate BlockHandlers / ItemHandlers
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1555 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-04 19:22:14 +00:00
madmaxoft@gmail.com
5c3235ecdc Implemented droppers
Added a common ancestor class "DropSpenser" that has the common code for dropper and dispenser and is Lua-accessible, too. The Debuggers plugin now triggers both droppers and dispensers when rclking them with a redstone torch.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1514 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-26 14:39:04 +00:00
madmaxoft@gmail.com
cf87169737 Refactored cInventory to use cItemGrid for the actual Storage
This makes the API more orthogonal and is easier to use in the plugins. Also changes in the inventory are now propagated to the needed places (armor updates to BroadcastEntityEquipment etc.) even when the inventory is changed by a plugin.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1503 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-24 07:30:39 +00:00
madmaxoft@gmail.com
e475c61a44 Stairs placement fix (patch contributed by Simi)
http://forum.mc-server.org/showthread.php?tid=503&pid=8159#pid8159

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1497 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-20 19:48:05 +00:00
madmaxoft@gmail.com
7e02ec87b9 Fixed a few out-of-bounds reads
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1465 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-09 19:06:16 +00:00
madmaxoft@gmail.com
1b7ea2ef82 Fixed a few possible crashes with out-of-bounds Y coords
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1413 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-04-27 13:23:20 +00:00
keyboard.osh@gmail.com
b75fc5f4e8 Initial implementation of explosions and TNT block
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1392 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-04-18 02:42:45 +00:00
madmaxoft@gmail.com
2006de2217 Cobwebs are now washed away by water and can be broken by swords and shears, giving string.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1363 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-04-06 18:20:06 +00:00
madmaxoft@gmail.com
d397dd263f Added carrots and potatoes handling, bonemealing and proper lighting.
FS #166

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1359 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-04-05 13:45:00 +00:00
madmaxoft@gmail.com
f9479f66aa Fixed crops producing pickups for creative mode players.
FS #350

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1356 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-04-03 16:54:49 +00:00
madmaxoft@gmail.com
8dc54301a4 BlockArea: Finished rotation and mirroring with meta. Implemented example meta handling for vines, stairs and torches.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1319 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-26 21:06:12 +00:00
madmaxoft@gmail.com
8090c13cde Huge performance boost in blockhandlers, they have direct access to chunk data when blockchecking.
Also fixed vines' placement.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1278 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-15 20:18:11 +00:00
madmaxoft@gmail.com
7593707713 Pickups are now being saved into Anvil.
Also changed cEntity rotation datatype to double

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1262 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-09 14:35:43 +00:00
madmaxoft@gmail.com
2588f5a605 Simulators now have direct access to the cChunk object in the WakeUp() call
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1227 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-02-28 07:42:45 +00:00
madmaxoft@gmail.com
32ee4aaf1e Removed all E_ITEM_ symbols equivalent to E_BLOCK_, and all obsolete item and block symbols.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1218 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-02-16 11:12:56 +00:00
madmaxoft@gmail.com
1a127f5510 Added the HOOK_BLOCK_TO_PICKUPS hook that fires when a block is dug up and should be converted to pickups.
Note that cItems is used in the function signature but not yet exported in the API, TODO!

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1176 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-01-27 02:00:33 +00:00
madmaxoft@gmail.com
bb36b8d511 Fixed piston placement.
FS #293

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1160 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-01-20 09:12:56 +00:00
madmaxoft@gmail.com
43e6840719 Merged branch "branches/hooks" into "trunk".
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1139 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-01-12 04:46:01 +00:00
luksor111@gmail.com
10d78bd93d Fixed compilation error in BlockCauldron.h on Linux
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1117 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-29 12:20:33 +00:00
luksor111@gmail.com
4561b2c22f Cauldrons and Brewing Stands are now placeable
Cauldrons can be filled with water and used to fill bottles

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1116 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-29 11:49:00 +00:00
luksor111@gmail.com
dcedcc3fe3 Fixed Linux compilation
Fixed flower pot consuming items in creative mode

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1111 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-27 10:23:10 +00:00
luksor111@gmail.com
ffcfa7c89b Added flower pots
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1107 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-27 01:01:16 +00:00
luksor111@gmail.com
994b02f5af Added sounds to levers and mobs
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1093 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-21 18:05:34 +00:00
madmaxoft@gmail.com
9d5a1a9f6d Fixed a bool evaluation warning in BlockDoor.h
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1083 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-20 09:51:33 +00:00
luksor111@gmail.com
05d71675f6 Added dispensers (they can't dispense items yet)
Fixed crash when digging snow
Moved BlockPlace hook check, so Core plugin will no longer block item usage
Player chat messages are now visible in the console

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1081 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-19 21:19:36 +00:00
luksor111@gmail.com
a10c4774f5 Implemented double doors
Implemented fence gate
Updated g_BlockTransparent[]
Doors can now only be opened by right clicking
Doors will now drop when not supported by block

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1080 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-19 09:29:53 +00:00
madmaxoft@gmail.com
b1777fa867 Levers (patch contributed by Keyboard)
http://forum.mc-server.org/showthread.php?tid=649

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1075 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-16 05:52:45 +00:00
luksor111@gmail.com
8ca150b700 Added initial adventure mode support
Added missing Emerald crafting recipe
You get more fall damage when jumping
Torch no longer protects players from fall damage
Fixed Ender Chest drops

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1070 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-11-27 19:55:23 +00:00
luksor111@gmail.com
eb7131bd12 Fixed certain blocks crashing clients when mined
Fixed rail duplication glitch
Fixed fall damage calculation
Glass no longer drops glass

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1068 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-11-26 10:03:34 +00:00
luksor111@gmail.com
c24905426c Implemented rail placement mechanics.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1065 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-11-25 13:50:20 +00:00
luksor111@gmail.com
eed6f9bb7b Fixed drops for: Stone, Mycelium, Redstone Torch.
Fixed item usage for Jukeboxes and Spawn eggs in survival.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1064 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-11-24 09:50:38 +00:00
madmaxoft@gmail.com
b65a22fc1f Fixed boolean comparison.
Don't compare booleans to false / true, use them directly.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1048 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-11-16 16:03:56 +00:00
luksor111@gmail.com
ea8545dff1 - Added the "wait" music disc
- Vines can now be placed on leaves

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1045 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-11-15 18:57:47 +00:00
madmaxoft@gmail.com
403ef6bcdc Fixed a valgrind warning in BlockDirt.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1011 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-26 08:47:30 +00:00
luksor111@gmail.com
1e45242546 New Block property g_BlockIsSolid[]; Fixed ladder, torches and vines placement. (Patch contributed by funmaker)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1005 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-23 18:13:37 +00:00
madmaxoft@gmail.com
331d012849 Slight formatting tuneup to the previous commit.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1003 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-22 18:04:15 +00:00
madmaxoft@gmail.com
793ae5359d Vine decay (patch contributed by funmaker)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1002 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-22 18:00:05 +00:00
madmaxoft@gmail.com
3f9e876d70 Added jukeboxes (patch contributed by Luksor)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@994 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-21 07:46:28 +00:00
madmaxoft@gmail.com
12edc53ab5 Double chests are formed correctly in all situations (meta is adjusted for the neighboring chest)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@991 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-20 20:16:55 +00:00
madmaxoft@gmail.com
4afb8bceb7 Chest does check if it can be placed at the coords specified (the client does the check itself, too, but this may be good for scripts)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@989 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-20 19:25:24 +00:00
madmaxoft@gmail.com
41a38e8d90 Floody fluid simulator now dries up correctly, too.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@964 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-14 18:30:16 +00:00
madmaxoft@gmail.com
f7da7c2536 Preparation for multiple fluid simulators.
Moved all simulators into a subfolder.
Replaced cWaterSimulator and cLavaSimulator with a generic cFluidSimulator.
Moved original fluid simulation into cClassicFluidSimulator.
Fluid simulator parameters (MaxHeight, Falloff) are read from the world.ini file (can have nether-like lava with lower falloff)

git-svn-id: http://mc-server.googlecode.com/svn/trunk@956 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-13 09:53:28 +00:00
madmaxoft@gmail.com
7b42204b24 All blockticking is now done in cBlockHandlers
git-svn-id: http://mc-server.googlecode.com/svn/trunk@942 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-07 10:08:57 +00:00
madmaxoft@gmail.com
28332c6567 Completely removed the old (buggy) redstone simulator.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@937 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-06 20:04:58 +00:00
madmaxoft@gmail.com
c19a0f3da6 Minor style cleanup
git-svn-id: http://mc-server.googlecode.com/svn/trunk@922 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-03 16:21:46 +00:00
madmaxoft@gmail.com
ea2ed2c918 Moved blockticking into blockhandler classes.
Also slightly refactored the variable / argument names (BlockID is deprecated, use BlockType instead)

git-svn-id: http://mc-server.googlecode.com/svn/trunk@921 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-03 08:52:11 +00:00
madmaxoft@gmail.com
85164fab8e Slight refactoring of BlockHandlers - dropping unneeded virtual functions
( http://forum.mc-server.org/showthread.php?tid=434&pid=4734#pid4734 )

git-svn-id: http://mc-server.googlecode.com/svn/trunk@917 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-01 21:08:15 +00:00
faketruth
673fdcd768 Added some missing block enums
Spruce, birch and jungle wood stairs now orient correctly

git-svn-id: http://mc-server.googlecode.com/svn/trunk@916 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-30 19:07:03 +00:00
faketruth
789be67922 Forgot to commit BlockBed.cpp
git-svn-id: http://mc-server.googlecode.com/svn/trunk@913 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-29 21:07:54 +00:00
faketruth
17486c7853 Beds can be slept in now (it doesn't change the time though)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@911 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-29 20:43:42 +00:00
madmaxoft@gmail.com
4df23d19b7 Unified folder name-casing
git-svn-id: http://mc-server.googlecode.com/svn/trunk@902 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-29 13:59:32 +00:00