1
0
Commit Graph

358 Commits

Author SHA1 Message Date
samoatesgames
19ea5d5423 Improved spawn location calculations.
- Supports Overworld and Nether spawns.
 - Supports spawning under objects, but still above ground (e.g. under the leaves of a tree).
 - Protects against spawning in oceans.
 - Protects against spawning in water.
 - Uses a radial search about the origin, rather than a linear.
 - Correctly calculates Nether spawn on spawn world generation (fixes: cuberite#2548)
 - Fixes a bug in CheckPlayerSpawnPoint() where the X offset was used in both the X and Z coords (BLOCKTYPE BlockType = GetBlock(a_PosX + Coords[i].x, a_PosY, a_PosZ + Coords[i].x);)
2015-11-13 15:08:16 +00:00
Lukas Pioch
9749c3aac9 Implemented brewing 2015-11-03 18:00:55 +01:00
Mattes D
7d551fe9f6 Added weather intervals to world.ini settings. 2015-09-28 01:02:17 +02:00
Tiger Wang
a8bfe3a4c1 Prepared ScheduleTask for threading refactor
* Llama-ified and condensed Schedule/QueueTask
- Removed hackery done with piston animations
2015-09-25 18:56:49 +01:00
tycho
6e86d20f73 Add new "ForEach" function: ForEachLoadedChunk. 2015-09-24 15:54:32 +01:00
Mattes D
6e4122e551 Unified the doxy-comment format. 2015-07-31 16:49:10 +02:00
Tiger Wang
c633dd8cec Merge pull request #2363 from scribblemaniac/improve-spider-ai
Improved spider AI
2015-07-16 22:22:48 +01:00
hallucino
9c85ed5864 Spawn baby mobs 2015-07-16 22:49:55 +02:00
scribblemaniac
55aa438831 Improved spider AI
Fixes #2335
2015-07-16 11:15:57 -06:00
worktycho
106e06617a Merge pull request #2224 from cuberite/ChunkQueueCollapsing
Chunk queue collapsing: MK II
2015-07-04 14:43:00 +01:00
STRWarrior
e5cfe0cd96 Added a size check for portals.
Made the portal size configurable

Alpha-sorted SetXYZNetherPortalXYZ functions
2015-06-28 17:05:44 +02:00
Hax52
9f1d1c058f Buttons no longer click on when already on. Buttons now play sound when clicking off. 2015-06-24 13:52:56 -05:00
Tiger Wang
dd4b415051 Reinstate "Chunk queue collapsing"
This reinstates commit f36acb6835
     and reverts commit adfbc42c02.
2015-06-10 15:16:05 +01:00
worktycho
adfbc42c02 Revert "Chunk queue collapsing" 2015-06-07 20:45:47 +01:00
tycho
19c95ee564 Moved Chunk Broadcasts over to the regular queue 2015-06-05 22:31:21 +01:00
tycho
06a74e45e2 Made cLightingThread own its callbacks 2015-05-30 11:11:17 +01:00
tycho
dae9e5792a Made -Weverything an error. 2015-05-24 12:56:56 +01: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
f2689c4887 Fixed a lot of warnings 2015-05-19 11:50:59 +01:00
Mattes D
c13b1931ff More style checking.
Spaces around some operators are checked.
2015-05-09 12:58:54 +02:00
tycho
448df85e56 Added support for additional data in the ParticleEffect Packet
Also started refactoring how broadcasts are handled
2015-05-07 03:47:46 +01:00
Mattes D
e5a7a730ed Merge pull request #1826 from mc-server/UnifyPacketizer
Unify packetizer
2015-03-24 13:09:41 +01:00
Mattes D
e9b8be25f9 Changed linked world name variables and setters / getters.
Ref.: #1792
Ref.: https://github.com/mc-server/MCServer/pull/1792#discussion_r25946707
2015-03-21 15:20:31 +01:00
Mattes D
cc069ccb2a Changed cEntity::m_UniqueID to UInt32. 2015-03-21 15:18:17 +01:00
Mattes D
781c8683f7 Added cPluginLua::cResettable interface, used for scheduled tasks.
This allows plugins to register objects that can "survive" the plugin unloading - they will simply bail out if the plugin is already unloaded, instead of referencing bad plugin data.
Fixes #1556.
2015-03-20 15:13:33 +01:00
tumultenrx
a215070cf2 Monsters will now attack. Additional checks have been added when generating spawn.
Monsters will now attack. Additional checks have been added when generating spawn.
2015-03-13 00:02:36 +01:00
Mattes D
7dfeb67f01 Converted cServer to use the cNetwork API. 2015-01-27 14:53:31 +01:00
Mattes D
b1c58b7b52 cWorld: Fixed a type warning. 2015-01-18 15:10:05 +01:00
Tycho
acc2dcbbc3 Fix trailing whitespace 2015-01-11 21:53:20 +00: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
Mattes D
ccdf03daaf Refactored all player block placing to go through hooks.
Fixes #1618.
2014-12-24 07:20:17 +01:00
Tiger Wang
4b20a61519 Merge branch 'master' into redstone 2014-12-13 12:11:01 +00:00
Mattes D
781b3303a5 Merge pull request #1657 from mc-server/PrepareChunk
Prepare chunk
2014-12-11 17:06:18 +01:00
Mattes D
fcd3d1bfed Added a cWorld:PrepareChunk function.
It prepares the chunk - loads or generates it and lights it.
The spawn prepare process uses this function.
2014-12-10 22:35:16 +01:00
Mattes D
32bce44f1f Merge pull request #1623 from p-mcgowan/issue_1253
Prevent multiple logins with same username, unless allowed in settings
2014-12-10 11:17:11 +01:00
Mattes D
c014f5624c Merged branch 'origin/master' into c++11. 2014-12-04 22:04:16 +01:00
Mattes D
a73c800377 Improved comments for cWorld::DoWithPlayer(). 2014-11-30 11:11:47 +01:00
Vincent
20dcceb7e6 removed GetUsernames() from World 2014-11-29 15:46:31 -08:00
Vincent
a7bf2725c8 fixed naming of strings and changed from i to I 2014-11-29 11:22:03 -08:00
Vincent
61e761fdc2 issue 1253 - prevent multiple logins with same username 2014-11-29 00:36:15 -08:00
Tiger Wang
187bdab4fa Merge remote-tracking branch 'origin-master' into c++11 2014-11-25 23:03:33 +00:00
Tiger Wang
79e5b82354 Merge remote-tracking branch 'origin/master' into c++11
Conflicts:
	src/Noise/Noise.h
	src/World.h
2014-11-23 17:12:34 +00:00
Mattes D
b520f336da cWorld: Rewritten spawn preparation.
It now supports pregeneration distance of any size and runs in two threads in parallel (generator / lighting).
Fixes #1597.
2014-11-22 16:00:19 +01:00
Mattes D
9ece37e8f1 Merge pull request #1598 from mc-server/SignEditor
Fixed a security problem with signs.
2014-11-18 08:52:48 +01:00
Howaner
78fb789631 Fixed a security problem with signs. 2014-11-15 15:16:52 +01:00
Howaner
a0e1e43fc1 Merge branch 'master' into ViewDistance 2014-11-14 22:33:54 +01:00
Mattes D
c9a3cb4d3f Fixed trailing whitespace. 2014-11-12 21:59:42 +01:00
Lukas Pioch
13b20d6fe2 renamed FindAndDoWithUUID to DoWithPlayerByUUID, fixed style and comments, added description to APIDump 2014-11-05 21:57:38 +01:00
Lukas Pioch
9f71a4e7ae Added FindAndDoWithUUID 2014-11-02 21:01:23 +01:00
Howaner
415c0e128e ... in this world 2014-10-30 21:38:32 +01:00
Howaner
9c7661f50f Added a MaxViewDistance option. 2014-10-30 21:24:10 +01:00
Tiger Wang
85c298d73e Cleaned up simulators 2014-10-25 21:54:00 +01:00
Mattes D
765bf006ad Merged branch 'master' into c++11. 2014-10-24 10:19:13 +02:00
Howaner
72bb299a4a Merge branch 'master' into ChunkLoader
Conflicts:
	src/ChunkSender.cpp
	src/ClientHandle.cpp
	src/World.h
2014-10-23 14:59:42 +02:00
Tiger Wang
a26541a7c3 En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Howaner
6f99615ceb Merge branch 'master' into ChunkLoader
Conflicts:
	src/World.h
2014-10-21 21:16:04 +02:00
Mattes D
bcb839d07b Merged branch 'master' of git://github.com/sriehl/MCServer 2014-10-21 18:12:40 +02:00
Howaner
44514e53fc Merge branch 'master' into ChunkLoader
Conflicts:
	src/ClientHandle.cpp
2014-10-21 16:55:22 +02:00
Tiger Wang
987f79afdd En masse NULL -> nullptr replace 2014-10-20 21:55:07 +01:00
Tiger Wang
aa19a3afb0 Migrated random generators to std::random 2014-10-19 14:10:18 +01:00
Mattes D
eeb580a74e Functions in cPluginManager get references instead of pointers. 2014-10-15 19:09:09 +02:00
Mattes D
1eae7d0ece Fixed style. 2014-10-13 10:34:33 +02:00
worktycho
fff9e50109 Aligned simulators 2014-10-12 12:44:59 +01:00
Steven Riehl
856764dee8 convert old style casts to fix warnings 2014-10-11 20:39:55 -06:00
tycho
473c0425d3 Moved a few objects to unique_ptr 2014-10-10 15:33:19 +01:00
Howaner
b493beb3bb Stream 4 chunks per tick. Added priority. 2014-10-06 21:27:53 +02:00
Howaner
af997a09ca Merge branch 'master' into Fixes 2014-09-26 22:23:36 +02:00
Howaner
d83d6456e8 Fixed players custom name in 1.8 2014-09-26 17:37:19 +02:00
Tycho
9c459cbe50 Merge branch 'master' into redstoneTests
Conflicts:
	src/Mobs/Monster.h
2014-09-25 15:22:08 +01:00
Howaner
4398156b2e Merge branch 'master' into 1.8-Protocol 2014-09-19 14:31:18 +02:00
Howaner
43ed690520 Exported player list states to extra functions. 2014-09-18 18:50:17 +02:00
Tycho
045d54e0e2 Merge branch 'master' into redstoneTests
Conflicts:
	src/Blocks/ChunkInterface.h
2014-09-17 18:47:33 +01:00
Tycho
6e7c0e33b5 Added first test to show the object can be created 2014-09-17 18:40:10 +01:00
nesco
b70e09bc90 Update World.h 2014-09-17 17:32:37 +02:00
nesco
f246faec16 Preparing 1.8 update
Added Spectator gamemode
2014-09-16 20:05:55 +02:00
Howaner
69afc4dbba Merge branch 'master' into 1.8-Protocol
Conflicts:
	src/Items/ItemHoe.h
2014-09-13 01:21:43 +02:00
Howaner
d07ef85ee3 Spawn exp if you break a mob spawner. 2014-09-12 16:41:23 +02:00
Howaner
bee615b75b Merge branch 'master' into 1.8-Protocol 2014-09-12 13:28:06 +02: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
Howaner
3bd3ac2200 1.8: Added ParticleEffect packet. 2014-09-11 17:03:09 +02:00
Howaner
f94df06b66 Added the player list to the 1.8 protocol. 2014-09-09 03:02:25 +02:00
Tycho
2c945c8818 TimeOfDay does not need to be an Int64 2014-09-08 19:07:45 +01:00
Mattes D
137b021d26 Rewritten chunk status to specify whether the chunk is in queue.
This fixes #1370.
2014-09-05 22:16:48 +02:00
madmaxoft
3297a39c27 Merge remote-tracking branch 'origin/master' into EntitiesInBox 2014-09-04 14:02:18 +02:00
madmaxoft
a51c1e0b73 Added cWorld::ForEachEntityInBox() 2014-09-03 17:00:26 +02:00
LO1ZB
75e1316386 fix chunk regenerating 2014-08-29 20:19:45 +02:00
LO1ZB
3c1c073714 remove y-coord from chunks 2014-08-28 11:36:35 +02:00
madmaxoft
008c1cdaf4 CheckBasicStyle checks the src folder as well. 2014-08-14 01:03:30 +02:00
Howaner
cccc321384 Renamed functions. 2014-08-10 16:46:03 +02:00
Howaner
32e1e9a553 Renamed m_DoDaylightCycle to m_CycleDaylight. 2014-08-08 22:07:30 +02:00
Howaner
4271d719b6 Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.
I need this for a GameRule plugin.
2014-08-07 01:07:32 +02:00
Howaner
81e095adda Exported the beacon. 2014-07-30 22:19:51 +02:00
madmaxoft
f095e770b8 Merged branch 'howaner/Options'. 2014-07-30 10:06:18 +02:00
Tiger Wang
4f5d73b770 Slight cleanup after portals 2014-07-29 20:50:30 +01:00
Tiger Wang
8811837aea Merge branch 'master' into portals
Conflicts:
	src/World.h
2014-07-29 15:27:19 +01:00
Howaner
a5cca16abe Add "Broadcasting" settings to world.ini 2014-07-27 00:39:39 +02:00
archshift
4191be7ddb Removed redundant semicolons and re-added warning 2014-07-24 11:21:37 -07:00
madmaxoft
c0b62ef139 Added a queue for setting chunk data.
Fixes #1196.
2014-07-24 18:32:05 +02:00
archshift
9045246e74 Export BroadcastEntityAnimation with ToLua
Fixes #752
2014-07-22 13:02:28 -07:00
Tiger Wang
a28b0dc120 Speed improvements, crash fixes, & self-suggestions 2014-07-22 17:26:48 +01:00
Tiger Wang
3385ed56b8 Merge remote-tracking branch 'origin/master' into portals
Conflicts:
	src/Chunk.cpp
	src/Entities/Player.cpp
	src/Root.cpp
	src/World.cpp
2014-07-22 10:24:28 +01:00
Tiger Wang
8050a5b98a Suggestions 2014-07-21 22:49:06 +01:00
madmaxoft
93d29555e5 Style: Normalized to no spaces before closing parenthesis. 2014-07-21 17:40:43 +02:00
Tiger Wang
6ab9afd0fd Bug and crash fixes
* Fixes end portals' solidity
* Fixed crashes to do with multithreading and removing an entity from
the wrong world
* Fixed crashes due to bad merge
* Fixed crashes due to an object being deleted twice
* Simplified cWorld::Start() and added comments to configuration files
2014-07-20 10:46:45 +01:00
madmaxoft
00c524519e Fixed style: spaces after commas. 2014-07-19 14:53:41 +02:00
Tiger Wang
719551c31f Fix failed merge and other issues 2014-07-18 20:12:27 +01:00
Tiger Wang
37140ae578 Merge branch 'master' into portals
Conflicts:
	src/Blocks/WorldInterface.h
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Generating/FinishGen.cpp
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol16x.cpp
	src/Protocol/Protocol16x.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/Root.h
	src/World.cpp
2014-07-18 20:10:51 +01: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
madmaxoft
7fff12bfac Fixed spaces around single-line comments.
There should be at least two spaces in front and one space after //-style comments.
2014-07-17 19:13:23 +02:00
madmaxoft
993fd14ddf Fixed basic whitespace problems.
Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
2014-07-17 16:33:09 +02:00
worktycho
4a6d606f74 Made CreateProjectile a pointer 2014-07-13 15:16:49 +01:00
Howaner
d529971e27 Changed BroadcastSoundEffect function to take floating pos. 2014-07-13 02:08:02 +02:00
Tiger Wang
5f72cdac38 Merge pull request #1154 from mc-server/trappedchests
Implemented trapped chests & others
2014-07-12 23:24:32 +01:00
madmaxoft
9e22f46b15 Implemented support for forced chunk ticking.
Fixes #1160.
2014-07-10 18:18:32 +02:00
Tiger Wang
74b6b398e7 Fixed arrow collection animation
* Fixed piston extension non-solidness
2014-07-09 19:56:50 +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
19caba5125 Redstone simulator is alerted to lever unpowering
* Fixed the "fix" that broke the fix for #535, thereby fixing said issue
* Fixed #535
2014-07-02 18:46:00 +01:00
Mattes D
9926abd4f5 Added generic entity-collecting.
Now any cEntity can be collected, not only cPickups.
This should help PR #1098.
2014-06-27 20:56:44 +02:00
Tiger Wang
7615ed90c0 Merge branch 'master' into portals
Conflicts:
	src/Chunk.cpp
	src/Entities/Entity.h
	src/Entities/Player.h
2014-06-21 22:14:23 +01:00
Tiger Wang
6e681269d9 Fixed invalid iterators 2014-06-21 22:07:38 +01:00
archshift
e8143de01b Nullify deleted pointers. 2014-06-19 01:49:56 -07:00
Howaner
c60ba8a52d Merge branch 'master' into GlobalFixes 2014-06-17 19:03:56 +02:00
Howaner
a89524d533 Add DoWithBlockEntityAt() to WorldInterface.h 2014-06-17 01:15:38 +02:00
Tiger Wang
a70b8298b6 Cauldrons check the heightmap 2014-06-14 10:14:04 +01:00
Tiger Wang
7188a1f670 Merge remote-tracking branch 'origin/master' into portals
Conflicts:
	src/World.h
2014-06-14 09:57:07 +01:00
madmaxoft
f76420ac55 Removed an unused fwd declaration. 2014-06-13 09:38:25 +02:00
worktycho
70c20d7772 Fixed constness 2014-06-11 17:17:19 +01:00
Tiger Wang
e24830f0b1 Compile fix 2014-06-11 13:49:57 +01:00
Tiger Wang
1a9467574e Reduced code duplication
call @maxmaxoft!
calling...
call connected (0:20)
call ended
2014-06-11 13:40:34 +01:00
Tiger Wang
f7913d3b74 IsWeatherSunnyAt does something useful :D 2014-06-11 13:37:04 +01:00
Alexander Harkness
c09207cabc SMICOLOSL
Meant to be semicolons up there.
2014-06-11 13:20:31 +01:00
Tiger Wang
711113cd2b Updated unnecessary function :/ 2014-06-11 13:10:10 +01:00
Alexander Harkness
c5010ebcc1 Add DoxyComments to he weather things.
Also changed the function names.
2014-06-11 13:01:52 +01:00
Alexander Harkness
c3c3782c67 Add new IsWeatherWet hook for cauldrons.
@madmaxoft can you comment?
2014-06-11 10:33:16 +01:00
Tiger Wang
bfa8aaf41b Merge branch 'master' into portals
Conflicts:
	src/ClientHandle.cpp
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol17x.cpp
2014-06-10 20:51:22 +01:00
Tiger Wang
35b79e5d71 Portal improvements and suggestions 2014-06-10 20:43:27 +01:00
Mattes D
af4a21ea06 Fixed deadlock when moving players to other worlds.
Fixes #1039, fixes #851
2014-06-08 21:58:30 +02:00
Mattes D
b904223b9d Added queue for adding entities to cWorld.
This alone doesn't work properly yet, further changes to cPlayer are needed.
2014-06-08 21:58:29 +02:00
Tiger Wang
156c9851b8 Suggestions 2014-06-05 17:58:29 +01:00
Tiger Wang
ccbf6cc446 Configurable portals 2014-06-04 20:00:55 +01:00
Tiger Wang
86e5273cd1 Merge remote-tracking branch 'origin/master' into portals 2014-06-04 13:14:38 +01:00
Tiger Wang
cea3a8e7e8 Cauldrons fill 2014-05-29 16:58:40 +01:00
Tiger Wang
365c6f50bd Changed block send queue to use vectors
As suggested by @worktycho.
2014-05-29 11:57:06 +01:00
Tiger Wang
ee929793f0 Hopefully fixed piston duplication issues
* Fixes #879
* Fixes #714
2014-05-25 13:46:34 +01:00
Tiger Wang
696a7bc52e Merge branch 'master' into fixes
Conflicts:
	src/Vector3.h
2014-05-06 20:15:19 +01:00
madmaxoft
839447f0bb Merge branch 'master' into fixes. 2014-05-02 19:34:28 +02:00
Tiger Wang
bbc5faa723 Redstone simulator now directly accesses cChunk
* Redstone simulator performance improvements
* Added return values to some functions
* Minor fixes
2014-04-27 17:35:41 +01:00
archshift
2c0bb7b717 Moved the weather picker out of TickWeather(), squashing a warning and improving readability. 2014-04-25 16:55:38 -07:00
Tiger Wang
48904ae201 Merge branch 'master' into fixes
Conflicts:
	src/World.h
2014-04-24 18:57:25 +01:00