Howaner
6ee7fd3c67
Merge branch 'master' into Inventory
2014-12-17 17:33:30 +01:00
Tiger Wang
8d9049603b
NULL -> nullptr
2014-12-16 23:18:59 +00:00
Howaner
b6fd400276
Own classes for all windows.
2014-12-13 15:06:55 +01:00
Howaner
bcbd73f7d8
MobSpawner fixes.
2014-12-01 14:58:13 +01:00
Howaner
2478e290f9
Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes.
2014-11-29 15:20:44 +01:00
Howaner
648fee1a08
Merge branch 'master' into MobSpawner
2014-11-29 12:05:35 +01:00
Mattes D
a6ed5cb1d8
BlockEntities: Removed the extra semicolon.
2014-11-27 22:42:08 +01:00
Howaner
8b028c5c78
Finished mob spawner implementation.
2014-11-18 15:33:41 +01:00
Howaner
42120e2ea5
Merge branch 'master' into MobSpawner
...
Conflicts:
MCServer/Plugins/Core
2014-11-18 14:56:32 +01:00
Tiger Wang
a26541a7c3
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
Mattes D
881bc66233
Fixed trailing whitespace.
2014-10-21 22:00:31 +02:00
Mattes D
bcb839d07b
Merged branch 'master' of git://github.com/sriehl/MCServer
2014-10-21 18:12:40 +02:00
Mattes D
b0a59927fb
cLuaState: cBlockEntity descendants are pushed with proper class type.
2014-10-19 12:46:25 +02:00
Tiger Wang
6a22b63473
Furnaces now update their block entity type
...
Therefore improving cChunk's variable boundary checking.
2014-10-18 19:54:34 +01:00
Alexander Harkness
f280c36f9d
Simpler code.
2014-10-18 16:12:12 +01:00
Alexander Harkness
59902c28f2
Nullptr?
2014-10-16 20:21:33 +01:00
Alexander Harkness
818c7948b7
Fixed a number of stylistic issues.
2014-10-16 19:08:22 +01:00
Steven Riehl
4a25760363
fix std:min call, include algorithm and compare same type
2014-10-11 21:36:40 -06:00
Steven Riehl
dfd4e15ecb
refactor an if block to std::min
2014-10-11 21:18:57 -06:00
Steven Riehl
856764dee8
convert old style casts to fix warnings
2014-10-11 20:39:55 -06:00
Tiger Wang
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
Tiger Wang
9e4a5f824a
Removed WSSCompact
2014-09-30 22:20:21 +01:00
Tiger Wang
a9243257e5
Compilation fix
2014-09-28 13:11:41 +01:00
Tiger Wang
7ce09a9113
Suggestions
2014-09-27 19:19:28 +01:00
Tiger Wang
d1814d2d67
Merge remote-tracking branch 'origin/master' into chestcarts
...
Conflicts:
src/Entities/Minecart.cpp
2014-09-27 18:40:00 +01:00
Howaner
5e71d5299c
Fixed compile errors.
2014-09-27 00:07:17 +02:00
Howaner
033d16babb
Merge branch 'master' into MobSpawner
...
Conflicts:
src/MobSpawner.h
src/Mobs/Monster.h
2014-09-26 23:56:20 +02:00
Tycho
a3f940f47c
Removed more unessicary includes
2014-09-26 18:13:19 +01:00
worktycho
411c69b420
Merge pull request #1419 from mc-server/redstoneTests
...
Added test mocking to IncrementalRedstoneSimulator
2014-09-26 16:04:26 +01:00
Howaner
67fe834499
Fixed dispender direction bug
2014-09-25 18:37:36 +02:00
Chris Darnell
806871b86f
A few compiler warning fixes
2014-09-22 18:23:56 -04:00
Howaner
718eb227ab
Implemented mob spawner.
2014-09-19 23:00:54 +02:00
Tycho
6e7c0e33b5
Added first test to show the object can be created
2014-09-17 18:40:10 +01:00
Howaner
3d94a7ea56
Created MobSpawnerEntity class.
2014-09-17 17:45:13 +02:00
Tiger Wang
3e74113427
Implemented Chest Minecarts
2014-09-12 23:18:02 +01:00
Tycho
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
Mattes D
0a651b9fd8
Added Y-wise asserts to signs.
...
This should help detect #1313 's second case.
2014-09-06 18:59:17 +02:00
Mattes D
74204aed6c
Merge pull request #1365 from mc-server/coverityFixes
...
Coverity fixes
2014-09-01 13:41:20 +02:00
madmaxoft
1e60265a90
Fixed style.
2014-09-01 13:33:17 +02:00
worktycho
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
Howaner
0beed83ae9
Rewrited furnace.txt loading.
2014-08-31 19:00:36 +02:00
madmaxoft
db663c7ee1
Fixed style.
2014-08-30 22:24:04 +02:00
Tiger Wang
431b7ed0b7
Merge branch 'master' of https://github.com/mc-server/MCServer
...
Conflicts:
src/Server.cpp
2014-08-29 14:56:40 +01:00
Tiger Wang
fca5a01145
Improved command block security
2014-08-29 13:41:50 +01:00
Tycho
5623a045f5
Fixed potential null dereference
...
Fixes CID 70466
2014-08-10 22:06:56 +01:00
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