1
0
Commit Graph

262 Commits

Author SHA1 Message Date
LogicParrot
7f5757eccf Reduced unnecessary block updates 2016-04-23 00:30:00 +03:00
LogicParrot
83459d0d89 Proper entity destruction in non-ticking chunks 2016-02-19 07:05:22 +02:00
LogicParrot
ca6ef58b1e Bulk clearing of whitespace 2016-02-05 23:50:18 +02:00
bibo38
657b0ed007 Changed the format of the MobHead data to allow MobHeads working on MInecraft 1.8
The NBT format now carries the texture data and transmit it to the client.
See: http://minecraft.gamepedia.com/Head#Block_entity
Related to #2674
2016-01-11 17:55:32 +01:00
Mattes D
80e1eb37dd Renamed leftover strings to Cuberite / Server, as needed.
Also upgraded the user setting file for MSVC to 2013.
2016-01-01 21:05:09 +01:00
Tiger Wang
5b62c4c314 Reorganised the redstone simulator
-> Many thanks to @worktycho for the idea, and @Haxi52 for the implementation plan!
* Uses classes and inheritance now
* Speed should be improved
2015-12-18 13:17:38 +00:00
Lukas Pioch
d620dcdd08 Moved variables into scope, removed unused variables and fixed variables 2015-12-17 10:48:36 +01:00
Gargaj
f9008a4860 allow use failures to propagate from the entity/block to the player 2015-12-13 13:27:38 +01:00
Dave Tucker
83870f9fc0 Add enum for Sound and Particle Effects
Fixes #2603

Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
2015-11-24 13:21:40 +00:00
worktycho
171867009e Fix memory leak
Fixes CID 132249
2015-11-08 22:34:52 +00:00
Lukas Pioch
9749c3aac9 Implemented brewing 2015-11-03 18:00:55 +01:00
Lukas Pioch
079bb7c016 Update Loops required for JsonCPP 2015-10-26 00:16:35 +00:00
Mattes D
9871c0b073 Added CircleCI for stylechecking.
This will allow us to remove the stylecheck from Travis builds, making them a bit faster, and having fast style checks
2015-09-17 11:20:10 +02:00
Tiger Wang
511334c500 Fixes #2485 2015-09-02 21:11:25 +01:00
Mattes D
6e4122e551 Unified the doxy-comment format. 2015-07-31 16:49:10 +02:00
Samuel Barney
804805d35a Silenced and fixed many warning messages across multiple files. 2015-07-29 09:49:30 -06:00
hallucino
9c85ed5864 Spawn baby mobs 2015-07-16 22:49:55 +02:00
mmdk95
d3662e6589 Fixed DropSpenser sound #2333 2015-07-12 19:30:51 +02:00
Nounours Heureux
91833b7cb8 (Ender) Chests are obstructed by opaque blocks. 2015-07-07 12:29:52 +02:00
worktycho
106e06617a Merge pull request #2224 from cuberite/ChunkQueueCollapsing
Chunk queue collapsing: MK II
2015-07-04 14:43:00 +01:00
Tiger Wang
813ca04676 Fixes #2245
Whoops :/
2015-06-17 00:27:50 +01:00
tycho
b259ab53fb Fixed override
This was causing a compile error in clang 3.6
2015-06-15 18:03:54 +01:00
Tiger Wang
dd4b415051 Reinstate "Chunk queue collapsing"
This reinstates commit f36acb6835
     and reverts commit adfbc42c02.
2015-06-10 15:16:05 +01:00
Alexander Harkness
1e77f27191 Merge pull request #2144 from mc-server/comparators
Redstone improvements [SEE DESC]
2015-06-09 09:15:08 +01:00
worktycho
adfbc42c02 Revert "Chunk queue collapsing" 2015-06-07 20:45:47 +01:00
Tiger Wang
de5b1401f8 Comparators 2015-06-06 12:21:09 +01:00
tycho
bfe52277b4 Rewrote ChunkSending queue for significantly improved performance 2015-06-05 22:31:21 +01:00
HaoTNN
e82cd6e4eb Fixes multiple furnace issues, including from loading world storage 2015-06-03 02:19:22 -07:00
HaoTNN
3142598dee Merge branch 'master' of https://github.com/mc-server/MCServer 2015-06-02 16:08:57 -07:00
tycho
b2fa71a32a Fix comments 2015-05-28 12:54:04 +01:00
tycho
dae9e5792a Made -Weverything an error. 2015-05-24 12:56:56 +01:00
HaoTNN
2578afb244 Merge remote-tracking branch 'upstream/master' 2015-05-23 14:06:37 -07:00
tycho
81c0116cf1 Merge branch 'master' into PreventNewWarnings 2015-05-23 07:33:52 -07:00
Lukas Pioch
e30b2ed487 Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher. 2015-05-23 16:28:37 +02:00
tycho
77f1f58c0a Make -Werror disabling file only
Ad fix a load of warnings
2015-05-19 19:32:10 +01:00
haotnn
6128e3f7cd Fixes lit furnace issue in #2051 2015-05-18 23:19:03 -07:00
Tiger Wang
30b17bcb97 Improved hoppers
* Fixes #1994
2015-05-11 22:58:27 +01:00
Mattes D
c13b1931ff More style checking.
Spaces around some operators are checked.
2015-05-09 12:58:54 +02:00
Mattes D
e5a7a730ed Merge pull request #1826 from mc-server/UnifyPacketizer
Unify packetizer
2015-03-24 13:09:41 +01:00
Mattes D
cc069ccb2a Changed cEntity::m_UniqueID to UInt32. 2015-03-21 15:18:17 +01:00
Tommy Santerre
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
Mattes D
2d1d4ae3e3 Removed unwanted base classes from Lua API. 2015-03-19 21:26:38 +01:00
Howaner
685f6e3713 Moved window code into cpp files 2015-03-10 19:40:53 +01:00
Howaner
1eedccc56a Merge branch 'master' into Inventory 2015-01-25 00:34:19 +01:00
Tycho
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
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