1
0
Fork 0
Commit Graph

322 Commits

Author SHA1 Message Date
Tycho 6acddd0cad Fixed style issues 2014-08-06 13:19:22 +01:00
Tycho a0ba7426c6 Fixed multiple inhertance being output by tolua 2014-08-06 13:17:05 +01:00
Tycho 9272bd627c Removed dependecy of redstone simulator on NoteBlock 2014-08-05 22:54:36 +01:00
Tycho 06942871dd Refactored Redstone simulator not to depend on TNTEntity or DropSpenserENtity Directly 2014-08-05 21:48:23 +01:00
Howaner 3b4255dbfe Fixed a bug who can used from hacked clients. 2014-08-02 00:14:05 +02:00
Howaner 09b63565bc Use "default:" in switch. 2014-07-31 23:19:05 +02:00
Howaner 6b1f7e7a45 Renamed "select..." methods to "set..." and better IsValidEffect() function. 2014-07-31 18:15:39 +02:00
Howaner c49d4fd215 Updated documentation. 2014-07-31 12:15:18 +02:00
Howaner 556fc908ae Renamed functions and added beacon json saving. 2014-07-31 12:13:11 +02:00
Howaner e6ca5a5ece Added window update. 2014-07-30 22:54:19 +02:00
Howaner dcd226d904 Added beacon load/save. 2014-07-30 22:50:34 +02:00
Howaner ad4fa6eba8 Changed return type from GetPrimaryPotion() and GetSecondaryPotion() 2014-07-30 22:22:06 +02:00
Howaner 81e095adda Exported the beacon. 2014-07-30 22:19:51 +02:00
Howaner 89b1bbdc5f Added beacon. 2014-07-30 21:59:35 +02:00
archshift 4191be7ddb Removed redundant semicolons and re-added warning 2014-07-24 11:21:37 -07:00
madmaxoft 93d29555e5 Style: Normalized to no spaces before closing parenthesis. 2014-07-21 17:40:43 +02:00
madmaxoft 08748bafe2 Code style: Fixed braces on separate lines. 2014-07-19 15:23:40 +02:00
archshift 725d1fd1e2 Subdirs: Only add_library if not using MSVC 2014-07-18 17:41:43 -07:00
archshift 1a05b7c5d7 BlockEntities/CMakeLists.txt: Replaced glob with list of files 2014-07-18 17:41:43 -07:00
madmaxoft 2df5e26d3b Fixed spaces before commas. 2014-07-18 09:57:34 +02:00
madmaxoft 5e198c6730 Basic style fixes. 2014-07-17 22:50:58 +02:00
madmaxoft 2423fbf2ef Normalized comments.
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
2014-07-17 22:15:34 +02:00
Tiger Wang 1df5a1f237 Fixed a DropSpenser AddFace bug 2014-07-15 22:53:44 +01:00
madmaxoft e2a1118f88 Pass cItem by reference.
Fixes CID 66445.
2014-07-15 08:48:12 +02:00
worktycho e1a561286a Fixed Issue with Comparing agast the wrong chest, potentially causing crashes. 2014-07-13 16:03:14 +01:00
Howaner d529971e27 Changed BroadcastSoundEffect function to take floating pos. 2014-07-13 02:08:02 +02:00
madmaxoft d72a81cb8e cHopperEntity: Simplified chest conditions. 2014-07-12 23:34:32 +02:00
madmaxoft c4f1284d9c cChestEntity: Renamed a member to avoid confusion. 2014-07-12 23:30:34 +02:00
madmaxoft 9ab0f259c7 Fixed alignment. 2014-07-12 23:25:59 +02:00
Tiger Wang e71e432633 Suggestions and bug fix
* Fixed hoppers pushing/pulling to/from (trapped)chests that do not form
a double-chest with the chest type directly connected to said hopper;
thank you, @madmaxoft
2014-07-12 22:06:25 +01:00
Tiger Wang 6a33fa84ae Suggestions 2014-07-11 12:43:24 +01:00
Tiger Wang 164ffe50ad Made things consistent 2014-07-08 12:34:39 +01:00
Tiger Wang 9e44b0aae1 Implemented trapped chests & others
+ Added trapped chests
* Fixed a bunch of bugs in the redstone simulator concerning wires and
repeaters
* Other potential bugfixes
2014-07-06 23:50:22 +01:00
Tiger Wang dde641ce83 Properly implemented enderchests 2014-06-29 11:36:38 +01:00
Mattes D 742370497a Fixed crashes in HopperEntity.
Some of the coords were off and some functions were assuming too much.
Fixes the crash reported in http://forum.mc-server.org/showthread.php?tid=1497
2014-06-24 09:46:04 +02:00
Tiger Wang b2bf466122 Chests don't open if obstructed
* Fixes FS383
2014-06-22 14:47:05 +01:00
Howaner c60ba8a52d Merge branch 'master' into GlobalFixes 2014-06-17 19:03:56 +02:00
madmaxoft 220e6f5880 DispenserEntity code cleanup after PR merge. 2014-06-11 19:46:24 +02:00
JoannisO 720ae4f757 - Fixed a lot of alignment 2014-06-05 12:26:27 +02:00
JoannisO 852e162f95 - Removed the code that removed fireworks from a dispenser even thought
they weren't launched.
2014-06-04 12:40:01 +02:00
JoannisO e5b345a9c9 - Fixed variable names in a function. 2014-06-04 12:37:51 +02:00
JoannisO 2c103a713e - Fixed a lot of astethics 2014-06-04 12:35:45 +02:00
JoannisO 7993caa553 - Fixed an issue where there were 2 "DispChunk"-s in the same function.
Resused the initial one.
2014-06-03 19:43:15 +02:00
JoannisO c0716bfcf6 - Fixed a bug where I didn't return anything in the GetShootVector
function. This was however passed as "working" by GCC.
2014-06-03 19:39:56 +02:00
JoannisO 2ecf425c39 - Fixed a bug where I used the FireCharge ITEM instead of the Projectile
ENUM
2014-06-03 18:19:06 +02:00
JoannisO daae75b30b - Cleaned up the code massively
- Stopped using cChunk in the GetShootVector class. Parameter is now the
Metadata of the block
- Stopped using cChunk in the SpawnProjectileFromDispenser method now
using coordinates and finding the chunk by itself.
- Removed the matrix calculations from GetShootVector.
2014-06-03 17:21:38 +02:00
Joannis 545478802b - Added doxy comments and exported to lua
- Manipulation of the ShootVector is not to be done by the function that
wants to spawn a projectile.
2014-06-03 09:26:14 +02:00
JoannisO b436359237 - Changed the name of the ProjectileLookVector method.
Note: I still think the new name is unclear. Any other suggestions are
welcome.
2014-05-31 16:08:15 +02:00
JoannisO ab633c8bd6 - Prefixed all args with "a_"
- Added braces around the cases.
2014-05-29 20:19:36 +02:00
Howaner 142fa83124 Code improvements 2014-05-28 19:32:20 +02:00
Howaner d8072da61f Fix skull bugs. 2014-05-28 15:54:43 +02:00
JoannisO 427bddc189 - Removed breaks. I thought it wouldn't compile without them but the
issue was appearantly solved with an earlier commit.
2014-05-28 15:16:45 +02:00
JoannisO 4bc02781af - Fixed an issue where dispensers would only shoot arrows (appearantly
some commits didn't come through)
- Cleaned up the code according to suggestions.
2014-05-28 14:34:33 +02:00
Joannis e5fd782524 - Implemented vertical dispensing for projectiles.
- Fixed some terrible commit issues on my side.
2014-05-28 09:10:09 +02:00
Joannis 1128dc783f - Fixed the ampersands and asterisks to fit the format.
- Fixed the method "SpawnProjectileFromDispenser" to use CamelCasing.
2014-05-27 11:08:06 +02:00
JoannisO 74801f5647 - Added support for more types of projectiles in the Dispenser
- Improved the method of spawning projectiles in the world
- Added another method for spawning the projectiles
2014-05-26 14:47:04 +02:00
JoannisO c9c2a4f479 Added Arrow- and FireCharge-Dispensing to DispenserEntity. 2014-05-26 08:44:16 +02:00
archshift e2194e6e90 Added static const, initialized fields. 2014-04-26 15:32:14 -07:00
archshift e47dab84f3 Cmake generated projects for IDEs include headers in project files. 2014-04-25 09:56:15 -07: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 f48d43f050 Fixed Flint and Steel, reverted Minecart change, renamed a parameter name 2014-04-19 20:51:52 +02:00
madmaxoft 6eac586794 Fixed formatting, made function static. 2014-04-19 13:05:58 +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
STRWarrior 433bd530f3 Some tweaks
GetPyramidLevel returns 0 when no layers were found, 1 for one layer etc.
Auto adjust the minY and/or maxY to 0 if the beacon is low.
2014-04-12 00:35:13 +02:00
STRWarrior eb4dd23775 Removed debug message. 2014-04-12 00:21:37 +02:00
STRWarrior e19556ebf6 Simplefied GetPyramidLevel 2014-04-12 00:13:16 +02:00
STRWarrior 875c2557c3 Implemented the skeleton code for the beacon.
There is no handling for the GUI. It can now check how big the pyramid is under the beacon.
2014-04-12 00:01:15 +02:00
Mattes D 25529ba62f Fixed a few MSVC type warnings. 2014-04-03 09:27:17 +02:00
madmaxoft 89027cb675 Fixed double to float conversions. 2014-03-16 22:00:28 +01:00
Howaner ccc29c7c6c Add fireball interact 2014-03-14 23:52:51 +01:00
Howaner b37966fd21 Change TNT Fuse to ticks 2014-03-08 12:24:33 +01:00
Howaner 787a71929c Add Flower Pots 2014-03-07 01:30:34 +01:00
madmaxoft d97363a1b3 Documented the changes in cJukeboxEntity. 2014-02-28 15:41:46 +01:00
Mattes D 6ad4b78a7b Merge pull request #709 from Howaner/GlobalFixes
Add 'Group not found', when the Server load the users.ini and add auto g...
2014-02-28 14:28:50 +01:00
madmaxoft 46f6cef99f Fixed compilation in MSVC (forward class definitions). 2014-02-24 22:47:58 +01:00
Tycho df193c8f6f BlockEntities is warnings free 2014-02-24 11:29:59 -08:00
Howaner b3339a6617 Better Jukebox API 2014-02-21 22:26:04 +01:00
Howaner d63ce62f3b Rename SkullEntity to MobHeadEntity 2014-02-19 14:45:09 +01:00
Howaner 823ee3a125 Add break to Protocol17x.cpp and use new comment delimiter 2014-02-19 14:12:34 +01:00
Howaner 52c41f8869 Add Heads completely 2014-02-18 21:40:02 +01:00
Howaner 777041806f Add Skulls/Heads 2014-02-17 20:14:08 +01:00
Tiger Wang b0fd5511ea Fixed typographical error 2014-02-15 13:55:58 +00:00
Tiger Wang c6a2e8c688 Removed debug messages again 2014-02-15 12:58:17 +00:00
Tiger Wang f4f0099947 Added proper debug messages 2014-02-13 20:20:37 +00:00
Tiger Wang c0e7d6fec9 Fancy stuff with constant references 2014-02-13 19:57:23 +00:00
Tiger Wang 6ed4f476ce Added more missing GetClassStatic()s 2014-02-12 22:06:59 +00:00
Tiger Wang e915a0df4c Removed some unneeded BroadcastWholeWindow()s 2014-02-12 22:06:13 +00:00
Tiger Wang f97ce30151 Changed inheritance a bit
* cBlockEntityWithItems now inherits from cBlockEntityWindowOwner
2014-02-12 22:01:22 +00:00
Tiger Wang 9d54f2b761 Fixed #190
+ Hoppers now collect pickups above them
2014-02-11 22:54:01 +00:00
Tiger Wang c53406f0d4 Fixed #612
* Chests send contents updates to client
2014-02-11 22:04:11 +00:00
Mattes D 97ee3340e3 Minor style improvements for the merged PR. 2014-01-23 14:14:33 +01:00
andrew 4ef61d8bf6 Command block fixes 2 2014-01-23 14:57:04 +02:00
Tiger Wang e4c3d799ff Removed unneeded paramters 2014-01-19 19:42:25 +00:00
Tiger Wang 1af89a8b50 Changed SendBlockEntity format slightly
* Writing NBT is now in Protocol, not BlockEntity files
* Fixed a last output bug
2014-01-19 13:25:35 +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
andrew a037172465 Command block fixes 2014-01-18 21:27:54 +02:00
andrew 02c9aa2b1e Parse the MC|AdvCdm plugin message 2014-01-18 19:58:46 +02:00
andrew 1ad6469a18 Command blocks: Execute() 2014-01-18 16:59:33 +02:00
andrew be5299350a Command block (de)serialization 2014-01-18 15:40:47 +02:00
andrew 9a9b51a513 Basic command block implementation 2014-01-18 15:16:47 +02:00
Tiger Wang 74645fdfaa Removed obsoleted functions 2014-01-16 19:00:49 +00:00
madmaxoft 9c8af58b75 Fixed a few MSVC warnings. 2014-01-06 22:22:33 +01:00
madmaxoft ee15d4e08e Fixed compilation in VC2008.
Also removed an unused inline header file (yuck).
2013-12-30 17:41:59 +01:00
Tycho Bickerstaff d724241407 converted commneted paramater names to the unused macro 2013-12-22 13:46:55 +00:00
Tycho Bickerstaff b3046a09e5 Chunk is now warnings clean 2013-12-21 15:58:21 +00:00
Tycho Bickerstaff 3289abde73 fixed hidden bug with furnaces ignoring time burnt
this patch fixes an issue with furnaces where they would ignore the time burnt in setBurnTimes
this did not cause a problem as this function was only called with the same value as the one
it was using for time burnt
2013-12-21 15:49:59 +00:00
Tycho Bickerstaff 38f808ac3d ChunkSender is now warnings clean 2013-12-21 15:00:31 +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
Tycho Bickerstaff 3585f93fc9 added blocks and blockentities 2013-12-19 00:06:24 +00:00
madmaxoft daade8ddee Fixed multiple inheritance in ToLua++.
This fixes #422.
2013-12-16 22:13:46 +01: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
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 ee4d57a076 Fixed pickups spawning for BlockEntities 2013-12-06 19:17:57 +00:00
madmaxoft 012840360e Moved json includes to where they are really needed. 2013-11-28 20:14:34 +01:00
madmaxoft 2113ca3844 Fixed VC2008 compilation, normalized include paths. 2013-11-27 09:17:25 +01:00
Alexander Harkness d925cf4def Fixed the remaining derps 2013-11-27 07:40:59 +00:00
Tiger Wang 32449f1fca Further attempts to fix compile 2013-11-25 18:29:36 +00:00
Tiger Wang e3db69c4ae Attempt to fix compilation 2013-11-24 18:44:22 +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