flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
6,591 Commits 1 Branch 0 Tags 92 MiB
670e94bfeb
Commit Graph

325 Commits

Author SHA1 Message Date
andrew
7aeb8ce993 Fixed cWither::KilledBy 2014-05-21 10:59:14 +03:00
andrew
07baf9bdd3 Cleaned up cPlayer::UpdateMovementStats; Wither achievements 2014-05-20 15:52:59 +03:00
STRWarrior
4ca178f24a Fixed compile problem. 2014-05-10 17:09:48 +02:00
STRWarrior
7f3683cfab A portal block now chooses a number between 2000 and 0 2014-05-10 17:03:02 +02:00
STRWarrior
3b1f11bd6a Each time a portal block receives a tick it has a 1 in 500 chance of spawning a zombie pigman. 2014-05-10 16:43:06 +02:00
Mattes D
fb58ef55be Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
Howaner
c96a27f4ae Superfluous method override. 2014-05-07 21:36:26 +02:00
Howaner
bc4a51781e Add lava and water check to block handlers. 2014-05-07 20:37:36 +02:00
Howaner
36a2aa2f21 Rename CanChangeDirtToGrass to CanDirtGrowGrass 2014-05-07 12:59:48 +02:00
Howaner
f5fe368220 Merge branch 'master' into Slabs 2014-05-07 12:54:58 +02:00
Howaner
7fe6e40bf7 Add clicks, exp subtraction, item check, ... 2014-05-05 17:34:29 +02:00
Howaner
3c102870f6 Add anvil window and slot area. 2014-05-05 17:34:17 +02:00
Tiger Wang
41f6643fd2 Fixed portal Z direction loop coding failure 
* Fixed portals created in the ZP/ZM direction eating its frame
* Changed return type of a function
 2014-05-04 00:38:06 +01:00
archshift
0e0c9d8248 Missed these CMakeLists. 2014-04-25 12:24:09 -07:00
STRWarrior
9660c4816f The new leaves don't decay anymore. 
Fixes #792
 2014-04-23 16:57:32 +02:00
Mattes D
6492aa000b Merge pull request #909 from jfhumann/fixes 
Bug fixes and optimizations.

We need to visit the API functions and check that they return only those values expected. `cWorld::CreateProjectile()` seems affected, too, by the same issue of ToLua returning extra values. In the cleanest form, these functions will need moving to ManualBindings.cpp
 2014-04-22 13:34:32 +02:00
jfhumann
013da806ec Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
daniel0916
1dfd2b1c5f Fixed Errors 2014-04-07 20:25:30 +02:00
daniel0916
2e9754ac1c Merge remote-tracking branch 'upstream/master' into Enchanting 2014-04-07 20:12:17 +02:00
Howaner
4d7b250a50 Remove old import 2014-04-06 21:45:55 +02:00
Howaner
7da308a7e1 Merge branch 'master' into Slabs 2014-04-06 21:43:23 +02:00
Howaner
039191499c Add CanChangeDirtToGrass function to Block Handlers. 2014-04-06 21:41:01 +02:00
Mattes D
2e789b63d3 Merge pull request #840 from Howaner/NewBlocks 
Add tall flower handler.
 2014-04-04 15:06:54 +02:00
madmaxoft
402d85d896 Fixed Clang warnings in itemhandlers. 2014-04-04 09:56:57 +02:00
Howaner
32d054e8fd Merge branch 'master' into Slabs 
Conflicts:
	src/Blocks/BlockDirt.h
 2014-04-03 22:03:18 +02:00
Howaner
0fb40da877 Change CanBeAt() from big flower 2014-04-03 21:53:18 +02:00
Howaner
cbb0352e51 Remove old function 2014-04-03 21:44:23 +02:00
Howaner
ca08a44c98 Grass now grows under up-side-down slabs 2014-04-03 21:43:40 +02:00
Mattes D
e7b8e17746 Merge pull request #849 from mc-server/minorfixes 
Minor fixes
 2014-04-02 21:26:45 +02:00
Tiger Wang
da267649a1 With eXtra line! 2014-04-02 20:04:41 +01:00
Tiger Wang
43af11ee38 Removed extra brackets 2014-04-02 20:03:42 +01:00
Mattes D
01c38505fd Merge pull request #831 from mc-server/Wither 
Wither
 2014-04-02 12:00:26 +02:00
madmaxoft
42e30b6513 Fixed clang warnings in BlockHandlers. 2014-04-01 14:58:17 +02:00
madmaxoft
aa7552309a Simplified the anvil placement code. 2014-04-01 14:23:11 +02:00
Tiger Wang
fc940b6da4 Realised suggestions 2014-03-31 21:36:19 +01:00
Tiger Wang
ee07b7ae3e Simplified and fixed slabs, fixes #835 2014-03-31 20:34:11 +01:00
Tiger Wang
0836fe9a84 Fixed a few Y too high/low asserts 2014-03-31 20:33:33 +01:00
madmaxoft
8288e53c0b Fixed a few Clang warnings in BlockHandlers. 2014-03-30 23:13:13 +02:00
madmaxoft
a5c0600e6c Fixed a few clang warnings. 2014-03-30 20:02:30 +02:00
Mattes D
e474f40ac9 Merge pull request #834 from narroo/issue503 
Issue503 pull Request
 2014-03-30 16:58:42 +02:00
worktycho
5260146f3c Merge pull request #838 from mc-server/lilypads 
Lilypads
 2014-03-30 15:17:35 +01:00
narroo
4492bd58f1 Added in MetaMirrorXY and MetaMirrorYZ to cBlockSignHandler. 2014-03-29 10:00:44 -04:00
Howaner
736c7950a2 Add "a_RelY < cChunkDef::Height" to BlockBigFlower 2014-03-29 13:11:49 +01:00
Tiger Wang
283a66bcae Some fixes to lilypads 
* Fixed placement on lava
* Fixed placement on side of blocks
* Fixed placement through blocks
+ Added washing-away of pads
+ Added ice as a block that fully occupies its voxel
 2014-03-28 22:51:30 +00:00
Howaner
a78bacac3c Add tallgrass drop to big flowers. 
Add tallgrass drop, when a players break a tallgrass with the shear.
 2014-03-28 23:14:58 +01:00
Howaner
f2f6096ee5 door -> flower 2014-03-28 22:24:54 +01:00
Howaner
efc89b2c43 Add tall flower handler. 2014-03-28 22:22:29 +01:00
madmaxoft
773ce7fde6 Fixed non-virtual destructors warnings. 2014-03-28 21:35:45 +01:00
Howaner
9c46112486 Change SpreadSource prefix to ss 2014-03-27 23:20:28 +01:00
Howaner
09794e65bb Wrong if in BlockLeaves 2014-03-27 23:20:28 +01:00
Howaner
3774b1be64 Add SpreadSource 2014-03-27 23:20:28 +01:00
Howaner
7089c5e267 Add new leaves to all classes. 2014-03-27 23:20:28 +01:00
narroo
6553c8ff44 Altered the rotates for cBlockSignHandler. The functions as a whole is still unfinished though; no wall sign or mirroring support yet. 2014-03-26 13:25:10 -04:00
narroo
90415ff798 Fixed Minor typos. 2014-03-26 08:54:17 -04:00
narroo
d5c7fc6bd6 Added a comment about the behavior of doors under mirros. Simply put, the current implementation of MetaMirror causes glitchy behavior. The door class itself needs to be edited. (I've got an idea on that....) 2014-03-25 17:35:48 -04:00
narroo
3df4f8609d Fixed spelling; Rotater to Rotator. 2014-03-25 17:26:13 -04:00
narroo
e1285eb84f Changed Rotater to Rotator. Added partial sign post rotation support. 2014-03-25 17:17:05 -04:00
andrew
c8445cd934 Fixed clang compilation 2014-03-25 11:40:54 +02:00
andrew
ba42166411 Fixed wither summoning 2014-03-25 11:13:27 +02:00
andrew
0fe1e50ffc Protocol: Wither metadata 2014-03-25 10:32:58 +02:00
Mattes D
c6186acf58 Merge pull request #828 from mc-server/Wither 
Wither invulnerability
 2014-03-25 08:54:13 +01:00
Mattes D
9226b8480e Merge pull request #829 from Howaner/Cake 
Add log pickups.
 2014-03-24 22:13:25 +01:00
Howaner
a6414d3348 Add log pickups. 2014-03-24 19:52:35 +01:00
andrew
6b77dc74ad Wither invulnerability 2014-03-24 12:29:19 +02:00
narroo
2343b0dfbe Added MetaRotate/Mirror Support for a number of classes. 2014-03-23 22:11:01 -04:00
Tiger Wang
f622f4317c Implemented lilypad placement 2014-03-23 22:32:45 +00:00
Mattes D
4ec402e6f9 Merge pull request #782 from mc-server/beds 
Beds now work properly, fixes #707
 2014-03-16 21:47:34 +01:00
Mattes D
dc77cbfdc4 Merge pull request #809 from Howaner/BlockEntitys 
More entity saving.
 2014-03-16 21:43:33 +01:00
Howaner
c5740c27a9 Wrong if in BlockLeaves 2014-03-16 21:39:01 +01:00
Howaner
b9fce71bf6 Add new leaves to all classes. 2014-03-16 21:38:57 +01:00
Howaner
96d80f981e Change if-clause in BlockCake.h 2014-03-16 20:57:23 +01:00
Howaner
4ec5a95a7a Add cake 2014-03-16 20:26:13 +01:00
Howaner
568038ab52 Fix anvil pickups. 2014-03-16 19:25:00 +01:00
Howaner
4e0edc9fa7 Add anvil direction. 2014-03-16 17:42:23 +01:00
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