3f6d823aa4
Correct world height validations.
...
Unify the way we test block above the current one (Height - 1 instead of a_RelY + 1).
Allow generation of world of flat height = 255
2015-03-19 20:32:17 -04:00
2d1d4ae3e3
Removed unwanted base classes from Lua API.
2015-03-19 21:26:38 +01:00
685f6e3713
Moved window code into cpp files
2015-03-10 19:40:53 +01:00
1eedccc56a
Merge branch 'master' into Inventory
2015-01-25 00:34:19 +01:00
2a9664d6ca
Initial convertion of a_Dt to std::chrono
...
also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay
2015-01-11 21:12:26 +00:00
6ee7fd3c67
Merge branch 'master' into Inventory
2014-12-17 17:33:30 +01:00
8d9049603b
NULL -> nullptr
2014-12-16 23:18:59 +00:00
b6fd400276
Own classes for all windows.
2014-12-13 15:06:55 +01:00
bcbd73f7d8
MobSpawner fixes.
2014-12-01 14:58:13 +01:00
2478e290f9
Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes.
2014-11-29 15:20:44 +01:00
648fee1a08
Merge branch 'master' into MobSpawner
2014-11-29 12:05:35 +01:00
a6ed5cb1d8
BlockEntities: Removed the extra semicolon.
2014-11-27 22:42:08 +01:00
8b028c5c78
Finished mob spawner implementation.
2014-11-18 15:33:41 +01:00
42120e2ea5
Merge branch 'master' into MobSpawner
...
Conflicts:
MCServer/Plugins/Core
2014-11-18 14:56:32 +01:00
a26541a7c3
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
881bc66233
Fixed trailing whitespace.
2014-10-21 22:00:31 +02:00
bcb839d07b
Merged branch 'master' of git://github.com/sriehl/MCServer
2014-10-21 18:12:40 +02:00
b0a59927fb
cLuaState: cBlockEntity descendants are pushed with proper class type.
2014-10-19 12:46:25 +02:00
6a22b63473
Furnaces now update their block entity type
...
Therefore improving cChunk's variable boundary checking.
2014-10-18 19:54:34 +01:00
f280c36f9d
Simpler code.
2014-10-18 16:12:12 +01:00
59902c28f2
Nullptr?
2014-10-16 20:21:33 +01:00
818c7948b7
Fixed a number of stylistic issues.
2014-10-16 19:08:22 +01:00
4a25760363
fix std:min call, include algorithm and compare same type
2014-10-11 21:36:40 -06:00
dfd4e15ecb
refactor an if block to std::min
2014-10-11 21:18:57 -06:00
856764dee8
convert old style casts to fix warnings
2014-10-11 20:39:55 -06:00
b5a2c6667a
Improved furnaces
...
* Fixed progress bar on 1.8
* Fixed bugs
* Improved code
* Fixes #1068
* Fixes #1070
2014-10-03 21:32:41 +01:00
9e4a5f824a
Removed WSSCompact
2014-09-30 22:20:21 +01:00
a9243257e5
Compilation fix
2014-09-28 13:11:41 +01:00
7ce09a9113
Suggestions
2014-09-27 19:19:28 +01:00
d1814d2d67
Merge remote-tracking branch 'origin/master' into chestcarts
...
Conflicts:
src/Entities/Minecart.cpp
2014-09-27 18:40:00 +01:00
5e71d5299c
Fixed compile errors.
2014-09-27 00:07:17 +02:00
033d16babb
Merge branch 'master' into MobSpawner
...
Conflicts:
src/MobSpawner.h
src/Mobs/Monster.h
2014-09-26 23:56:20 +02:00
a3f940f47c
Removed more unessicary includes
2014-09-26 18:13:19 +01:00
411c69b420
Merge pull request #1419 from mc-server/redstoneTests
...
Added test mocking to IncrementalRedstoneSimulator
2014-09-26 16:04:26 +01:00
67fe834499
Fixed dispender direction bug
2014-09-25 18:37:36 +02:00
806871b86f
A few compiler warning fixes
2014-09-22 18:23:56 -04:00
718eb227ab
Implemented mob spawner.
2014-09-19 23:00:54 +02:00
6e7c0e33b5
Added first test to show the object can be created
2014-09-17 18:40:10 +01:00
3d94a7ea56
Created MobSpawnerEntity class.
2014-09-17 17:45:13 +02:00
3e74113427
Implemented Chest Minecarts
2014-09-12 23:18:02 +01:00
0b044e1c83
Possibly decoupled IncrementalRedstoneSimulator from the rest of the server
...
THis wil hopefully allow for unit testing
2014-09-11 17:48:21 +01:00
0a651b9fd8
Added Y-wise asserts to signs.
...
This should help detect #1313's second case.
2014-09-06 18:59:17 +02:00
74204aed6c
Merge pull request #1365 from mc-server/coverityFixes
...
Coverity fixes
2014-09-01 13:41:20 +02:00
1e60265a90
Fixed style.
2014-09-01 13:33:17 +02:00
361b7d5379
Changed null check to assert
...
Changed the null check to clarify that the function should not be called before the entity has been attached to a world.
2014-08-31 21:14:42 +01:00
0beed83ae9
Rewrited furnace.txt loading.
2014-08-31 19:00:36 +02:00
db663c7ee1
Fixed style.
2014-08-30 22:24:04 +02:00
431b7ed0b7
Merge branch 'master' of https://github.com/mc-server/MCServer
...
Conflicts:
src/Server.cpp
2014-08-29 14:56:40 +01:00
fca5a01145
Improved command block security
2014-08-29 13:41:50 +01:00
5623a045f5
Fixed potential null dereference
...
Fixes CID 70466
2014-08-10 22:06:56 +01:00
6acddd0cad
Fixed style issues
2014-08-06 13:19:22 +01:00
a0ba7426c6
Fixed multiple inhertance being output by tolua
2014-08-06 13:17:05 +01:00
9272bd627c
Removed dependecy of redstone simulator on NoteBlock
2014-08-05 22:54:36 +01:00
06942871dd
Refactored Redstone simulator not to depend on TNTEntity or DropSpenserENtity Directly
2014-08-05 21:48:23 +01:00
3b4255dbfe
Fixed a bug who can used from hacked clients.
2014-08-02 00:14:05 +02:00
09b63565bc
Use "default:" in switch.
2014-07-31 23:19:05 +02:00
6b1f7e7a45
Renamed "select..." methods to "set..." and better IsValidEffect() function.
2014-07-31 18:15:39 +02:00
c49d4fd215
Updated documentation.
2014-07-31 12:15:18 +02:00
556fc908ae
Renamed functions and added beacon json saving.
2014-07-31 12:13:11 +02:00
e6ca5a5ece
Added window update.
2014-07-30 22:54:19 +02:00
dcd226d904
Added beacon load/save.
2014-07-30 22:50:34 +02:00
ad4fa6eba8
Changed return type from GetPrimaryPotion() and GetSecondaryPotion()
2014-07-30 22:22:06 +02:00
81e095adda
Exported the beacon.
2014-07-30 22:19:51 +02:00
89b1bbdc5f
Added beacon.
2014-07-30 21:59:35 +02:00
4191be7ddb
Removed redundant semicolons and re-added warning
2014-07-24 11:21:37 -07:00
93d29555e5
Style: Normalized to no spaces before closing parenthesis.
2014-07-21 17:40:43 +02:00
08748bafe2
Code style: Fixed braces on separate lines.
2014-07-19 15:23:40 +02:00
725d1fd1e2
Subdirs: Only add_library if not using MSVC
2014-07-18 17:41:43 -07:00
1a05b7c5d7
BlockEntities/CMakeLists.txt: Replaced glob with list of files
2014-07-18 17:41:43 -07:00
2df5e26d3b
Fixed spaces before commas.
2014-07-18 09:57:34 +02:00
5e198c6730
Basic style fixes.
2014-07-17 22:50:58 +02:00
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
1df5a1f237
Fixed a DropSpenser AddFace bug
2014-07-15 22:53:44 +01:00
e2a1118f88
Pass cItem by reference.
...
Fixes CID 66445.
2014-07-15 08:48:12 +02:00
e1a561286a
Fixed Issue with Comparing agast the wrong chest, potentially causing crashes.
2014-07-13 16:03:14 +01:00
d529971e27
Changed BroadcastSoundEffect function to take floating pos.
2014-07-13 02:08:02 +02:00
d72a81cb8e
cHopperEntity: Simplified chest conditions.
2014-07-12 23:34:32 +02:00
c4f1284d9c
cChestEntity: Renamed a member to avoid confusion.
2014-07-12 23:30:34 +02:00
9ab0f259c7
Fixed alignment.
2014-07-12 23:25:59 +02:00
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
6a33fa84ae
Suggestions
2014-07-11 12:43:24 +01:00
164ffe50ad
Made things consistent
2014-07-08 12:34:39 +01:00
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
dde641ce83
Properly implemented enderchests
2014-06-29 11:36:38 +01:00
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
b2bf466122
Chests don't open if obstructed
...
* Fixes FS383
2014-06-22 14:47:05 +01:00
c60ba8a52d
Merge branch 'master' into GlobalFixes
2014-06-17 19:03:56 +02:00
220e6f5880
DispenserEntity code cleanup after PR merge.
2014-06-11 19:46:24 +02:00
720ae4f757
- Fixed a lot of alignment
2014-06-05 12:26:27 +02:00
852e162f95
- Removed the code that removed fireworks from a dispenser even thought
...
they weren't launched.
2014-06-04 12:40:01 +02:00
e5b345a9c9
- Fixed variable names in a function.
2014-06-04 12:37:51 +02:00
2c103a713e
- Fixed a lot of astethics
2014-06-04 12:35:45 +02:00
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
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
2ecf425c39
- Fixed a bug where I used the FireCharge ITEM instead of the Projectile
...
ENUM
2014-06-03 18:19:06 +02:00
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
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
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
ab633c8bd6
- Prefixed all args with "a_"
...
- Added braces around the cases.
2014-05-29 20:19:36 +02:00
142fa83124
Code improvements
2014-05-28 19:32:20 +02:00
d8072da61f
Fix skull bugs.
2014-05-28 15:54:43 +02:00
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
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
e5fd782524
- Implemented vertical dispensing for projectiles.
...
- Fixed some terrible commit issues on my side.
2014-05-28 09:10:09 +02:00
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
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
c9c2a4f479
Added Arrow- and FireCharge-Dispensing to DispenserEntity.
2014-05-26 08:44:16 +02:00
e2194e6e90
Added static const, initialized fields.
2014-04-26 15:32:14 -07:00
e47dab84f3
Cmake generated projects for IDEs include headers in project files.
2014-04-25 09:56:15 -07:00
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
f48d43f050
Fixed Flint and Steel, reverted Minecart change, renamed a parameter name
2014-04-19 20:51:52 +02:00
6eac586794
Fixed formatting, made function static.
2014-04-19 13:05:58 +02:00
013da806ec
Did some static analysis, fixed some bugs and optimized a lot of code
2014-04-18 21:09:44 +02:00
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
eb4dd23775
Removed debug message.
2014-04-12 00:21:37 +02:00
e19556ebf6
Simplefied GetPyramidLevel
2014-04-12 00:13:16 +02:00
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
25529ba62f
Fixed a few MSVC type warnings.
2014-04-03 09:27:17 +02:00
89027cb675
Fixed double to float conversions.
2014-03-16 22:00:28 +01:00
ccc29c7c6c
Add fireball interact
2014-03-14 23:52:51 +01:00
b37966fd21
Change TNT Fuse to ticks
2014-03-08 12:24:33 +01:00
787a71929c
Add Flower Pots
2014-03-07 01:30:34 +01:00
d97363a1b3
Documented the changes in cJukeboxEntity.
2014-02-28 15:41:46 +01:00
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
46f6cef99f
Fixed compilation in MSVC (forward class definitions).
2014-02-24 22:47:58 +01:00
df193c8f6f
BlockEntities is warnings free
2014-02-24 11:29:59 -08:00
b3339a6617
Better Jukebox API
2014-02-21 22:26:04 +01:00
d63ce62f3b
Rename SkullEntity to MobHeadEntity
2014-02-19 14:45:09 +01:00
823ee3a125
Add break to Protocol17x.cpp and use new comment delimiter
2014-02-19 14:12:34 +01:00
52c41f8869
Add Heads completely
2014-02-18 21:40:02 +01:00
777041806f
Add Skulls/Heads
2014-02-17 20:14:08 +01:00
b0fd5511ea
Fixed typographical error
2014-02-15 13:55:58 +00:00
c6a2e8c688
Removed debug messages again
2014-02-15 12:58:17 +00:00
f4f0099947
Added proper debug messages
2014-02-13 20:20:37 +00:00
c0e7d6fec9
Fancy stuff with constant references
2014-02-13 19:57:23 +00:00
6ed4f476ce
Added more missing GetClassStatic()s
2014-02-12 22:06:59 +00:00
e915a0df4c
Removed some unneeded BroadcastWholeWindow()s
2014-02-12 22:06:13 +00:00
f97ce30151
Changed inheritance a bit
...
* cBlockEntityWithItems now inherits from cBlockEntityWindowOwner
2014-02-12 22:01:22 +00:00
9d54f2b761
Fixed #190
...
+ Hoppers now collect pickups above them
2014-02-11 22:54:01 +00:00
c53406f0d4
Fixed #612
...
* Chests send contents updates to client
2014-02-11 22:04:11 +00:00
97ee3340e3
Minor style improvements for the merged PR.
2014-01-23 14:14:33 +01:00
4ef61d8bf6
Command block fixes 2
2014-01-23 14:57:04 +02:00
e4c3d799ff
Removed unneeded paramters
2014-01-19 19:42:25 +00:00
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
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
a037172465
Command block fixes
2014-01-18 21:27:54 +02:00
02c9aa2b1e
Parse the MC|AdvCdm plugin message
2014-01-18 19:58:46 +02:00
1ad6469a18
Command blocks: Execute()
2014-01-18 16:59:33 +02:00
be5299350a
Command block (de)serialization
2014-01-18 15:40:47 +02:00
9a9b51a513
Basic command block implementation
2014-01-18 15:16:47 +02:00
74645fdfaa
Removed obsoleted functions
2014-01-16 19:00:49 +00:00
9c8af58b75
Fixed a few MSVC warnings.
2014-01-06 22:22:33 +01:00
ee15d4e08e
Fixed compilation in VC2008.
...
Also removed an unused inline header file (yuck).
2013-12-30 17:41:59 +01:00
d724241407
converted commneted paramater names to the unused macro
2013-12-22 13:46:55 +00:00
b3046a09e5
Chunk is now warnings clean
2013-12-21 15:58:21 +00:00
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
38f808ac3d
ChunkSender is now warnings clean
2013-12-21 15:00:31 +00:00
32e6be002d
Merge branch 'master' into cmake
2013-12-20 15:33:04 +00:00
8610d45ef1
Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT).
2013-12-20 16:01:34 +01:00
3585f93fc9
added blocks and blockentities
2013-12-19 00:06:24 +00:00
daade8ddee
Fixed multiple inheritance in ToLua++.
...
This fixes #422 .
2013-12-16 22:13:46 +01:00
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
044fd237b6
Moved bindings-related to a Bindings subfolder.
...
Ref.: #407
2013-12-08 12:17:54 +01:00
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
ee4d57a076
Fixed pickups spawning for BlockEntities
2013-12-06 19:17:57 +00:00
012840360e
Moved json includes to where they are really needed.
2013-11-28 20:14:34 +01:00
2113ca3844
Fixed VC2008 compilation, normalized include paths.
2013-11-27 09:17:25 +01:00
d925cf4def
Fixed the remaining derps
2013-11-27 07:40:59 +00:00
32449f1fca
Further attempts to fix compile
2013-11-25 18:29:36 +00:00
e3db69c4ae
Attempt to fix compilation
2013-11-24 18:44:22 +00:00
c3cd436ec3
Merge remote-tracking branch 'origin/master' into foldermove2
...
Conflicts:
GNUmakefile
2013-11-24 14:37:03 +00:00
675b4aa878
Moved source to src
2013-11-24 14:19:41 +00:00
Tommy Santerre
Mattes D
Howaner
Tycho
Tiger Wang
Alexander Harkness
Steven Riehl
worktycho
Chris Darnell
archshift
JoannisO
jfhumann
STRWarrior
andrew
Alexander Harkness