1
0
Commit Graph

45 Commits

Author SHA1 Message Date
madmaxoft@gmail.com
3e4fb19321 Fixed block update queueing and water meta change not propagated to clients.
Fixes FS #333.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1297 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-22 16:48:45 +00:00
madmaxoft@gmail.com
18343674b3 Simulator: fixed a problem when manipulating the bedrock layer
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1295 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-22 14:54:08 +00:00
madmaxoft@gmail.com
e8aa03f8df DelayedFluidSimulator: optimized block storage for large amounts of blocks.
Speeds up chunk generation by 15 %. Expected to speed up fluid simulation, unmeasured.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1293 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-20 20:45:52 +00:00
madmaxoft@gmail.com
84a6a3d968 Fluid simulator: fixed an out-of-bounds read when determining fluid direction
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1280 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-17 13:24:27 +00:00
madmaxoft@gmail.com
6f883cba2d Small performance improvements in fluid simulator.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1276 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-14 21:56:01 +00:00
madmaxoft@gmail.com
eaf973544b Removed the Classic fluid simulator, it was too unstable
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1274 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-14 20:46:40 +00:00
madmaxoft@gmail.com
68b1aa23b0 Added a Noop fluid simulator that doesn't do anything with the fluid (fluid doesn't spread at all, behaves like a normal block)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1272 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-14 20:03:42 +00:00
madmaxoft@gmail.com
b18f657ac1 Added a Vaporize fluid simulator that simply replaces fluid blocks with air.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1270 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-14 19:44:27 +00:00
madmaxoft@gmail.com
e18e539ad2 Changed DelayedFluidSimulatorData to be a vector rather than a list, performance doubled :)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1268 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-14 08:00:24 +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
55326ee2a7 Simulators are woken up upon chunk load
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1248 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-03 15:33:55 +00:00
madmaxoft@gmail.com
4e8fd2c084 Redstone simulator: adding a block now checks if the neighbors are redstone-related; if not, the block is ignored.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1247 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-03 15:06:01 +00:00
madmaxoft@gmail.com
5d219dab28 Simulators now check if they are given a valid chunk
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1244 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-03 14:25:27 +00:00
madmaxoft@gmail.com
46e1228f73 SandSimulator: Fixed sand dropping on half-slabs; added more blocks that break falling sand into pickups, fixed instant-fall
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1242 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-03 08:40:37 +00:00
madmaxoft@gmail.com
86c97cb28a cSandSimulator: implemented InstantFall
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1241 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-02 20:24:18 +00:00
madmaxoft@gmail.com
6744738a85 Rewritten SandSimulator to use direct chunk access; and sand falling on torches now creates a pickup.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1240 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-02 19:57:09 +00:00
madmaxoft@gmail.com
91a84a05f5 DelayedFluidSimulator: removed an obnoxious debugging output
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1237 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-02 16:40:39 +00:00
madmaxoft@gmail.com
66670f5d5c Floody fluid simulator has been converted to use direct chunk access
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1236 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-02 15:44:31 +00:00
madmaxoft@gmail.com
011e11af2c New fire simulator, fully rewritten to the new scheme of things, directly accessing chunk data.
http://forum.mc-server.org/showthread.php?tid=617&pid=6626#pid6626

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1233 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-01 19:35:29 +00:00
madmaxoft@gmail.com
619ec8b247 Converted simulators to take cWorld reference instead of a pointer
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1228 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-02-28 13:39:20 +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
412c21a22c Floody fluid simulator can create sourceblocks (configurable in World.ini)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1119 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-01-04 05:21:07 +00:00
luksor111@gmail.com
575abe8691 Dispensers can dispense items and liquids now
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1105 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-26 17:16:33 +00:00
madmaxoft@gmail.com
af66f8ebae Fixed a crash in redstone simulator when destroying blocks in Y < 2
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1084 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-20 13:56:42 +00:00
madmaxoft@gmail.com
7f5bb5c3e3 RedstoneSimulator refactoring to use cWorld::GetBlockTypeMeta() as much as possible
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1076 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-16 07:07:30 +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
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
madmaxoft@gmail.com
1cd213fa60 Fixed more valgrind issues
( http://forum.mc-server.org/showthread.php?tid=598&pid=5139#pid5139 )

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1013 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-27 07:51:01 +00:00
madmaxoft@gmail.com
b08c1c7726 Removed excessive debug loggin in Floody fluid simulator.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@987 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-20 11:47:50 +00:00
madmaxoft@gmail.com
9a9f15eec6 Fluids will wash away crops and sugarcane.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@980 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-19 18:48:34 +00:00
madmaxoft@gmail.com
c68aa68c69 Fixed a few bugs in fluid placement - fluid into other fluid, fluid into washable blocks.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@977 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-18 19:41:29 +00:00
madmaxoft@gmail.com
99c9b2e11d Reverted previous commit, chose a different solution, much cleaner.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@975 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-18 13:39:42 +00:00
madmaxoft@gmail.com
7aa87d1818 Made constants in cChunkDef enums, compilation fixes for gcc.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@974 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-18 10:42:47 +00:00
madmaxoft@gmail.com
4b05df30d1 More blocks can be washed away by fluids.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@971 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-16 20:49:17 +00:00
madmaxoft@gmail.com
45c58077f7 Fixed floody fluid sim making downward fluid behave like source blocks.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@970 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-16 19:52:55 +00:00
madmaxoft@gmail.com
226b9ad8eb Decreased logging in floody fluid simulator.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@969 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-16 19:34:07 +00:00
madmaxoft@gmail.com
f9dab57d8b Fixed DelayedFluidSimulator.
Floody fluid simulator is now woken up properly across chunk borders.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@966 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-15 20:16:43 +00:00
madmaxoft@gmail.com
164f0e7de9 Floody fluid sim: reads params from world.ini; water and lava react together into cobblestone / stone / obsidian
git-svn-id: http://mc-server.googlecode.com/svn/trunk@965 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-14 20:10:03 +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
5b7de82a79 Initial Floody fluid simulator.
Can spread, cannot dry.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@963 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-14 17:06:21 +00:00
madmaxoft@gmail.com
b4ca06b9d9 Better split of the fluid simulator functionality; removed the old LavaSimulator and WaterSimulator files.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@958 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-13 16:24:50 +00:00
madmaxoft@gmail.com
ad883a233b Forgotten file
git-svn-id: http://mc-server.googlecode.com/svn/trunk@957 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-13 14:10:07 +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