madmaxoft
5c4c147e48
Silenced useless MSVC warnings in cMetaRotater.
2014-03-09 17:58:01 +01:00
Tiger Wang
888c3f1af7
Fixed VERIFY
2014-03-09 15:53:03 +00:00
Tiger Wang
b64e9fb7f5
Beds now work properly fixes #707
...
Also fixes FS392
Conflicts:
src/Blocks/WorldInterface.h
src/ClientHandle.cpp
2014-03-09 15:32:34 +00:00
Mattes D
8a715db41f
Merge pull request #775 from worktycho/warnings
...
Fixed a few warnings
2014-03-09 15:04:12 +01:00
Mattes D
3a6499b192
Merge pull request #729 from worktycho/MetaRotate
...
Alternitive solution to #503
2014-03-08 18:27:24 +01:00
Tycho
307fad0f25
Fixed issues with int vs size_t and a few other warnings
2014-03-08 08:33:38 -08:00
Tycho
c3758112cc
Merge branch 'master' into warnings
2014-03-08 07:13:45 -08:00
worktycho
16ebbca35b
Moved returns
2014-03-08 14:23:00 +00:00
andrew
6679641b9e
cBlockInfo-related changes from #723
2014-03-08 12:53:15 +02:00
Tycho
7f389522ef
Fixed warnings
2014-03-07 10:42:13 -08:00
Mattes D
f72c747b50
Merge pull request #763 from Howaner/BlockEntitys
...
Add Flower Pots
2014-03-07 17:54:10 +01:00
Howaner
c2090c0d11
Add Lua Bindings for FlowerPotEntity.h and add documentation.
2014-03-07 11:44:16 +01:00
Howaner
787a71929c
Add Flower Pots
2014-03-07 01:30:34 +01:00
Howaner
1c7a580e52
Fix comment
2014-03-06 13:35:53 +01:00
Howaner
594ddd86a0
Add SendBlockTo to cWorldInterface
2014-03-05 19:33:43 +01:00
Howaner
ee1ba3e0b0
Set tnt step sound to step.grass
2014-03-05 15:14:20 +01:00
Howaner
d4a5b16c52
Add data backsending, when the Client interacts a Block and the Interact is cancelled.
2014-03-05 15:10:20 +01:00
Mattes D
71ae689eb7
Merge pull request #746 from Howaner/Slabs
...
Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs
2014-03-03 20:52:08 +01:00
Tycho
a38be148ba
Reformatted
2014-03-02 12:33:08 -08:00
Tycho
6536233f4d
Reformated MetaRotater
2014-03-02 12:29:20 -08:00
andrew
070d483236
cBlockInfo now manages the respective cBlockHandler
2014-03-02 21:25:05 +02:00
Mattes D
b17d04737d
Merge pull request #738 from xdot/master
...
Refactored global block property arrays
2014-03-02 16:13:43 +01:00
Howaner
e4b2502896
Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs
2014-03-02 16:01:37 +01:00
worktycho
8990410f18
Reverted BlockVine
2014-03-02 12:02:29 +00:00
Mattes D
0f2d9bc35f
Merge pull request #733 from Howaner/Slabs
...
Fix Double Slabs, fix Slab Meta and add more things to burnable
2014-03-02 10:22:40 +01:00
andrew
d73cdba1f6
g_BlockXXX => cBlockInfo::XXX
2014-03-01 21:34:19 +02:00
Tycho
1e1d89fd20
Fixed errors
2014-03-01 10:17:55 -08:00
Tycho
5093b75ef1
Revesed typedef
2014-03-01 10:14:24 -08:00
Tycho
65edffd5b0
Implemented Rotations
2014-03-01 10:04:50 -08:00
Tycho
0d26e81ab5
Merge branch 'master' into MetaRotate
2014-03-01 09:48:44 -08:00
Tycho
0acfbdd912
Final implementation of MetaRotater
2014-03-01 09:47:27 -08:00
madmaxoft
c18748648d
Forgotten changes to cChunkInterface.
2014-03-01 02:54:46 +01:00
madmaxoft
aecbf77293
Removed cBlockHandler forward declaration from cChunkInterface.
...
Wasn't needed. Also reformatted the code.
2014-03-01 02:46:50 +01:00
Howaner
0274db0e14
Use switch in GetStepSound
2014-02-28 22:32:10 +01:00
Howaner
66c8425041
Fix Double Slabs, fix Slab Meta and add more things to burnable
2014-02-28 15:26:32 +01:00
Tycho
84913299f4
Added some Metadate rotaters using templated Mixin
2014-02-27 11:33:35 -08:00
Mattes D
6c9779630e
Merge pull request #704 from Howaner/GlobalFixes
...
Global fixes
2014-02-20 22:14:16 +01:00
Mattes D
eabf25ddbd
Merge pull request #702 from TheJumper/master
...
BlockBed.cpp: Fixed Multiple people in one bed.
2014-02-20 21:33:54 +01:00
Howaner
1016922012
Fix Cauldron
2014-02-20 20:58:23 +01:00
Howaner
01c01bac37
Add 'Meta < 3' to Cauldron
2014-02-20 17:45:18 +01:00
TheJumper
1b081a0fbb
BlockBed.cpp: Fixed space at if statement
...
Added a space after an if statement and before the first bracket to keep up code conventions.
2014-02-20 17:31:38 +01:00
TheJumper
c2277c6fee
BlockBed.cpp: Fixed Multiple people in one bed.
...
OnUse in BlockBed.cpp now checks whether bit flag 0x4 in the Data values of the bed is set before somebody can try to sleep in the bed.
2014-02-20 16:26:50 +01:00
Mattes D
191a08fc32
Merge pull request #700 from Howaner/GlobalFixes
...
Add new Trees (without Generator)
2014-02-20 16:24:52 +01:00
Howaner
16f3809ded
Add BlockNewLeaves.h and rename Darkoac to Darkoak
2014-02-19 19:18:40 +01:00
Howaner
a5a52fe160
Add new Trees (without Generator)
2014-02-19 16:58:31 +01:00
Howaner
d63ce62f3b
Rename SkullEntity to MobHeadEntity
2014-02-19 14:45:09 +01:00
Howaner
52c41f8869
Add Heads completely
2014-02-18 21:40:02 +01:00
Tiger Wang
c68bdaf34b
Fixed compile and some warnings in MSVS
2014-02-09 00:57:22 +00:00
Tiger Wang
f86f066615
Merge branch 'master' into playerimprovements
...
Conflicts:
MCServer/Plugins/APIDump/APIDesc.lua
2014-02-09 00:04:42 +00:00
Tiger Wang
aa8b46e947
Server internally uses new functions
2014-02-05 23:24:16 +00:00
Tiger Wang
630507fd5b
Fixed a bunch of MSVS warnings
...
* Possibly also fixed some bugs with pathfinding and TNT, though
unlikely
2014-02-04 23:07:22 +00:00
Mattes D
dad49c6fdd
Merge pull request #644 from worktycho/warningfixes
...
Improved Type safety of eBlockFace
2014-02-04 13:10:44 -08:00
Tycho
1f26c9f5ab
Fix gcc not having operator ++ on enums
2014-02-04 11:26:39 -08:00
Tycho
8464f689ea
Improved Type safety of eBlockFace
...
May Fix #640
2014-02-04 10:59:05 -08:00
madmaxoft
634331fd3b
Fixed chest placement.
...
Fixes #624 .
2014-02-04 18:38:10 +01:00
STRWarrior
70e48960ac
Named the different quartz block.
2014-02-03 22:30:32 +01:00
Tiger Wang
6bbba2644d
Fixed issues with farmland
...
* Fixed farmland reversion checks not taking into account carrots and
potatoes
* Fixed #623
2014-02-03 21:14:52 +00:00
STRWarrior
347488a9a2
Fixed some issues.
...
Meta wasn't set if the block wasn't a pillar.
Fixed typo.
2014-02-03 20:34:05 +01:00
STRWarrior
0c29c52ff3
Renamed cBlockQuartsHandler to cBlockQuartzHandler. Fixed not being able to place normal quartz blocks.
2014-02-03 20:22:45 +01:00
STRWarrior
5ba46ebc21
This renames the cBlockWoodHandler to cBlockSidewaysHandler, and implements a new cBlockQuartzHandler to handle the quartz pillars.
2014-02-03 20:08:38 +01:00
Tiger Wang
2d0b31e7b6
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-02-02 22:09:03 +00:00
Tiger Wang
ac03c51997
Fixed #624
2014-02-02 22:08:57 +00:00
madmaxoft
c3d4cc4f4f
Fixed dark oak and acacia placement.
...
Fixes #621 .
2014-02-02 17:52:05 +01:00
Tycho
42497847ac
Added missing files
2014-02-02 06:59:36 -08:00
Tycho
0b0aa5554f
Merge branch 'master' into GeneratingBenchmark2
...
Conflicts:
src/Blocks/BlockTorch.h
2014-02-02 06:56:07 -08:00
Tycho
b82fc394dd
Changed Signiture of OnUpdate
2014-02-02 06:49:37 -08:00
Tiger Wang
275035eb70
Fixed #620
2014-02-02 12:43:57 +00:00
Tycho
6e39ed3868
Changed Signiture of OnDigging
2014-02-01 08:35:48 -08:00
Tycho
cf3b4ec226
Changed Signiture of OnDestroyedByPlayer
2014-02-01 06:01:13 -08:00
Tycho
c6304b2b4f
Changed pointers to references
2014-02-01 05:06:32 -08:00
Tycho
25ec7750aa
Changed signitures of Several BLockHandler Methods
...
Changed the signitures of the following to use interfaces:
GetPlacementBlockTypeMeta
OnPlaced
OnPlacedByPlayer
OnDestroyed
OnNeighbourChanged
NeighbourChanged
OnUse
CanBeAt
Check
2014-01-31 15:17:41 -08:00
Tycho
6e6409b1a0
Removed cWorld Include
2014-01-26 07:10:29 -08:00
Tycho
a13d009a30
Refactored GetPlacementBlockTypeMeta
2014-01-26 07:06:25 -08:00
Tycho
bed2ee22e8
Merge branch 'master' into GeneratingBenchmark2
...
Conflicts:
src/Blocks/BlockRail.h
src/World.h
2014-01-26 06:28:51 -08:00
Tycho
14e48ccb4b
Refactored cBlockHandler::OnUse and dependents
2014-01-26 06:20:39 -08:00
Mattes D
09ee8a1bb6
Merge pull request #589 from mc-server/minecartimprovements
...
Minecart improvements
2014-01-26 05:13:54 -08:00
Tycho
15b92af166
First attempt at Implementing Interfaces
2014-01-25 11:14:14 -08:00
daniel0916
0c2b307eab
first changes for enchanting (not finished)
...
- added enchanting table block handler and added it to the blockhandler
- added enchanting window
- drop item in the slot 0 when the player close the window
- added enchanting packet (1.7 only)
- some more...
2014-01-20 18:22:08 +01:00
Tiger Wang
fc622ce194
Fixed weird meta with curved rails
2014-01-19 18:24:56 +00:00
Tiger Wang
8467f5dfae
Added more rail functionality
2014-01-19 14:52:45 +00:00
Tiger Wang
f8c8dcc7f3
Improved command blocks
...
* Their command and previous output are displayed on the client
* They have a BlockHandler implementation, so you can't place blocks on
them anymore
+ As a side effect, implemented UpdateBlockEntity
2014-01-19 00:54:38 +00:00
madmaxoft
aec5200893
Removed internal cEntity::GetRot() usage.
2014-01-17 11:11:17 +01:00
Tiger Wang
7eb3cabd19
Fixed #535
2014-01-16 19:55:21 +00:00
Tiger Wang
74645fdfaa
Removed obsoleted functions
2014-01-16 19:00:49 +00:00
Alexander Harkness
273db55bdf
Merge pull request #529 from mc-server/derpstonerefactor
...
Major refactoring of redstone
2014-01-12 04:38:41 -08:00
andrew
05e22dccf2
Fixed glowstone drop count
2014-01-11 11:38:34 +02:00
Tiger Wang
b068b73ad9
Renamed g_TorchPlaceable...
...
...to g_FullyOccupiesVoxel, as recommended by @bearbin
2014-01-11 01:51:24 +00:00
Tycho Bickerstaff
d724241407
converted commneted paramater names to the unused macro
2013-12-22 13:46:55 +00:00
Tycho Bickerstaff
94ca07cfbf
Merge branch 'master' of github.com:mc-server/MCServer
2013-12-22 13:19:27 +00:00
Mattes D
e0e01d0615
Merge pull request #461 from mc-server/repeaters
...
Repeaters, pressure plates, and others
2013-12-25 23:57:02 -08:00
madmaxoft
77aaa5c367
Merge branch 'fixes&features' of git://github.com/tonibm19/MCServer
2013-12-25 19:50:18 +01:00
tonibm19
4cee3d8fe3
(Hopefully) fixed if conditions
2013-12-25 19:32:45 +01:00
tonibm19
6b6b6e7498
Implemented xoft suggestion (partly)
...
I only get it working in first condition. It seems it's not compatible with else if...
2013-12-25 16:59:26 +01:00
Tiger Wang
1a02d94ed2
Fixed rails not updating with diagonals
2013-12-25 14:12:48 +00:00
tonibm19
258bb45880
BLOCKTYPE...
2013-12-24 19:31:32 +01:00
tonibm19
96c94a79a7
Fixed compilation
2013-12-24 19:25:34 +01:00
tonibm19
e3f89400d8
Implemented xoft suggestion
2013-12-24 19:13:18 +01:00
tonibm19
276f7dae5c
Using BLOCKTYPE instead of int
2013-12-24 19:08:22 +01:00
tonibm19
59f8068cf4
Fixed comments
2013-12-24 18:41:49 +01:00
tonibm19
85fc1478fa
Changed a little how detection works and added comments.
2013-12-24 18:37:09 +01:00
tonibm19
c06388aa4a
Storing Y -1 and -2 blocks in a variable
2013-12-24 18:07:33 +01:00
tonibm19
5e24577373
Using parenthesis
2013-12-24 12:35:40 +01:00
tonibm19
84bfffcc15
Fixed a possible crash
2013-12-24 12:23:20 +01:00
tonibm19
99ade2fa12
Improved iron golem detection algorithm
...
- You need to make it like in vanilla
- Only used blocks are removed
2013-12-23 12:00:08 +01:00
tonibm19
b95ee2d230
You can now spawn iron golems.
...
You can spawn them like in vanilla.
2013-12-23 10:26:45 +01:00
STRWarrior
4115724736
You can spawn snow golems with snow blocks and pumpkins.
2013-12-22 20:15:56 +01:00
STRWarrior
05c670dc50
Fixed cacus breaking when next to any non-air block.
2013-12-22 18:37:56 +01:00
Tycho Bickerstaff
5034ae29b8
Piston is now warnings clean
2013-12-21 15:08:01 +00:00
Tycho Bickerstaff
32e6be002d
Merge branch 'master' into cmake
2013-12-20 15:33:04 +00:00
madmaxoft
8610d45ef1
Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT).
2013-12-20 16:01:34 +01:00
madmaxoft
b19d765666
Fixed melon and pumpkin growing.
2013-12-20 15:50:46 +01:00
madmaxoft
00911c5f94
Fixed missing parenthesis.
2013-12-20 15:44:56 +01:00
Tiger Wang
c08910d4af
Fixed assertion during dirt block OnUpdate()
2013-12-19 23:06:26 +00:00
Tycho Bickerstaff
fbb47cd2ae
Merge branch 'master' into cmake
2013-12-19 17:14:52 +00:00
Tycho Bickerstaff
0e6107bfdd
Merge branch 'master' into cmake
2013-12-19 16:16:35 +00:00
Tiger Wang
53ff372624
Fixed dust from being placed on nonsolids
2013-12-19 15:57:35 +00:00
Tycho Bickerstaff
3585f93fc9
added blocks and blockentities
2013-12-19 00:06:24 +00:00
Tycho Bickerstaff
e627f2f98c
Merge branch 'master' into cmake
2013-12-18 19:06:11 +00:00
STRWarrior
ffca4f94c1
Implented Nether Wart.
2013-12-18 18:33:18 +01:00
Tycho Bickerstaff
77303b77c7
Merge branch 'master' of github.com:mc-server/MCServer into cmake
2013-12-10 23:10:50 +00:00
Tycho Bickerstaff
dd633d5a94
Merge branch 'master' into cmake
2013-12-10 23:01:35 +00:00
Tycho Bickerstaff
d9a429ec64
Merge branch 'master' into quickfixs
2013-12-10 23:01:24 +00:00
Tiger Wang
9987611792
Provides a possible fix for repeater timings
...
Not completely reliable, but at least some types of clock work.
2013-12-10 21:24:02 +00:00
Tycho Bickerstaff
973999f524
fixed unused expression warnings in blockFire
2013-12-10 19:35:05 +00:00
Tycho Bickerstaff
d9ecf51f5b
more cmake stuff
2013-12-10 19:30:12 +00:00
Tiger Wang
97a1147aca
Improved pickups spawning speed again
2013-12-09 23:43:06 +00:00
Tiger Wang
9c1b7c8b6e
Readded redstone lamp handler
2013-12-08 14:07:32 +00:00
Tiger Wang
1d554677b4
Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures
...
Conflicts:
src/Bindings/Bindings.cpp
src/Bindings/Bindings.h
src/Blocks/BlockHandler.cpp
2013-12-08 14:02:45 +00:00
madmaxoft
044fd237b6
Moved bindings-related to a Bindings subfolder.
...
Ref.: #407
2013-12-08 12:17:54 +01:00
madmaxoft
62adb2b965
Fixed stationary water starting fires and flowing lava not.
2013-12-08 11:47:40 +01:00
Tiger Wang
405f67dac8
Fixed water starting fires
2013-12-07 22:35:01 +00:00
Tiger Wang
5bed85aba0
Fixed some new 1.7 client crash bugs
...
Some technical blocks were removed; trying to render them as items
caused a crash.
2013-12-07 18:03:56 +00:00
Tiger Wang
347e80bdd8
Added basic ender chests
...
Note that they just mirror chests now, so no per player inventory.
2013-12-07 00:18:58 +00:00
Tiger Wang
b028731726
Fixed duplication glitch with QueueSetBlock
...
If a coordinate was queued, and then the block there was broken, it
would reappear: double items!
Also now just sets meta if previous and current blocktypes matched.
2013-12-06 22:29:15 +00:00
Tiger Wang
b115f3d636
Added trapdoor cursor Y detection
2013-12-06 21:31:55 +00:00
Tiger Wang
008c515b4b
Fixed trapdoors not overriding OnUse
2013-12-06 20:01:52 +00:00
Tiger Wang
77a7bfb3e5
Cleaned up torch code and added comments
2013-12-06 19:35:10 +00:00
Tiger Wang
73dd2e9bed
Removed another export and inline'd stuff
2013-12-06 19:24:45 +00:00
Tiger Wang
0376b847d7
Removed exporting of a torch function
2013-12-06 19:23:27 +00:00
madmaxoft
e48168aa13
Lava can spawn fire.
...
Settable in world.ini, lava can spawn fire to fuel blocks near it. Fix #65 .
2013-12-04 19:48:42 +01:00
Mattes D
2bbe5046e9
Merge pull request #387 from mc-server/trapdoors
...
Trapdoors, redstone fixes, and snow
2013-11-30 07:20:27 -08:00
madmaxoft
c70c2fa42f
Changed cBlockHandler->OnUpdate() to use cChunk directly.
2013-11-30 15:58:27 +01:00
madmaxoft
463de118a0
Grass doesn't spread to podzol or grassless dirt blocks.
2013-11-30 13:48:22 +01:00
Tiger Wang
ab382ef6b4
Fixed thin snow CanBeAt checking
...
Now takes into account the possibility that thin snow can be on top of
full thin snow.
2013-11-30 11:45:23 +00:00
Tiger Wang
0e0baa940a
Properly fixed snow height, fixes #98 and #264
2013-11-30 00:31:21 +00:00
Tiger Wang
4741e5e794
Stairs reset meta when dropped, fixes #269
...
Additionally, they now have walking sounds.
2013-11-29 22:28:59 +00:00
Tiger Wang
1d69c80ad3
Implemented trapdoors, fixes #43 and #105
...
Also updated redstone simulator to support it
2013-11-29 22:27:08 +00:00
Tiger Wang
cee5160be8
Removed unneeded CPP files
...
Also removed unneeded #include in BlockStems
2013-11-29 22:25:07 +00:00
Tiger Wang
a6630d3239
Merged master into redstonefixes
2013-11-27 21:35:13 +00:00
Alexander Harkness
c3cd436ec3
Merge remote-tracking branch 'origin/master' into foldermove2
...
Conflicts:
GNUmakefile
2013-11-24 14:37:03 +00:00
Alexander Harkness
675b4aa878
Moved source to src
2013-11-24 14:19:41 +00:00
