flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
9,794 Commits 1 Branch 0 Tags 92 MiB
456ffa5bd6
Commit Graph

4923 Commits

Author SHA1 Message Date
Julian Laubstein
6fdd7194c8 Merge pull request #2974 from LogicParrot/perl 
Bulk clearing of whitespace
 2016-02-06 11:37:34 +01:00
LogicParrot
2b81759bdc Merge pull request #2958 from LogicParrot/fence 
Pathfinder now properly treats nonsolids above fence
 2016-02-06 10:25:06 +02:00
LogicParrot
96f9afa278 Proper world linkages and dimension types for newly created world.ini's 2016-02-06 10:18:13 +02:00
LogicParrot
ca6ef58b1e Bulk clearing of whitespace 2016-02-05 23:50:18 +02:00
LogicParrot
87a31e3a2d Merge pull request #2972 from marvinkopf/PlayerAutoComplete 
Tab completion for player names now case insensitive.
 2016-02-05 22:42:20 +02:00
LogicParrot
e3fe15ca59 Merge pull request #2954 from kevinr/implement-acacia-block-height 
Implement acacia block height
 2016-02-05 22:32:44 +02:00
Marvin Kopf
0b826b0e52 Tab completion for player names now case insensitive. 2016-02-05 21:27:31 +01:00
LogicParrot
e51a139035 Ignore trailing and leading spaces in INI values# Please enter the commit message for your changes. Lines starting 2016-02-05 21:59:46 +02:00
Alexander Harkness
ac5170c7c4 Correct typo in documentation. 2016-02-05 16:45:55 +00:00
LogicParrot
d8861da599 Prevent server from starting if there's bad world linkage 2016-02-05 15:34:16 +02:00
Julian Laubstein
cb28aaface Merge pull request #2960 from LogicParrot/interspecies 
Prevent interspecies breeding
 2016-02-04 20:51:44 +01:00
LogicParrot
6661e5d27f Prevent interspecies breeding 2016-02-04 20:44:55 +02:00
LogicParrot
1376743e47 Pathfinder now properly treats nonsolids above fence 2016-02-04 13:53:59 +02:00
LogicParrot
8f7d929140 Fix unexpected world creation introduced by #2821 2016-02-04 10:06:07 +02:00
Kevin Riggle
e4a8c681b0 implement height logic for Acacia blocks 2016-02-04 01:20:31 -05:00
LogicParrot
4aade202e0 cMonster::m_Target safety across worlds 2016-02-03 22:50:17 +02:00
LogicParrot
a5403c8976 Merge pull request #2941 from LogicParrot/chunkBug2 
[Attempt 2] Fixed cChunk::m_Entities corruption upon world travel
 2016-02-03 20:19:11 +02:00
LogicParrot
fd91932a8b Merge pull request #2903 from marvinkopf/FixTabAutoComplete 
Fix TabAutoComplete
 2016-02-02 22:14:22 +02:00
Marvin Kopf
9840cc8218 Fix TabAutoComplete 
For tab on '/command s' the server now returns 'subcommand' instead of '/command subcommand'.
 2016-02-02 18:59:50 +01:00
LogicParrot
07b7fd4ad3 Fixed cChunk::m_Entities corruption upon world travel 2016-02-02 17:55:00 +02:00
Marvin Kopf
a1c48f4853 Fix cPawn pushing 
cPawn instances can no longer push an entity they are attached to. cEntity now has a IsAttachedTo method.
 2016-02-02 14:57:20 +01:00
Mathias
89f3dec7ac Updated old forum links 2016-01-31 02:25:03 +02:00
Mathias
752d99c8b8 MCServer to Cuberite 2016-01-29 21:47:00 +02:00
Mathias
152c7c064a Front-end update 2016-01-28 20:01:42 +02:00
Mattes D
a62e7ff2c2 LuaTcpSsl: Disabled cert verification due to missing CA chain. 2016-01-24 17:22:05 +01:00
Mattes D
f14c6d3c7e Fixed HTTP parsing when in insecure mode. 
Parsing would ignore the size of data already buffered, resulting in bad_alloc exception.
Fixes #2898.
 2016-01-22 23:33:18 +01:00
LogicParrot
439b3304f4 Improved tamed wolf pack cooperation and projectile reactions 2016-01-22 21:16:27 +02:00
LogicParrot
30b95fcc4e Merge pull request #2894 from LogicParrot/spider 
Spiders now friendly at daylight, new cChunk functions
 2016-01-22 20:53:34 +02:00
Anthony Birkett
d75168ca03 Fix running as a service. 
Two problems identified, both traced to commit 4315a11

(main.cpp) ParseArguments() was no longer being called before checking cRoot::m_RunAsService.
This led to m_RunAsService never being set (we use -d on the command line to instigate a service start).

(Root.cpp) Terminate events were being ignored when running as a service.
We only need to ignore the cin.good() call, not terminate events as a whole.
 2016-01-21 16:38:13 +00:00
LogicParrot
d344e574de Spiders now friendly at daylight, new cChunk functions 2016-01-21 08:21:29 +02:00
Lukas Pioch
e1ba104359 Fixed race conditions 2016-01-17 20:11:37 +01:00
LogicParrot
9c1cb488db Merge pull request #2887 from LogicParrot/water 
Use IsBlockWater in cPath
 2016-01-17 13:36:03 +02:00
LogicParrot
18a8caaf6d Use IsBlockWater in cPath 2016-01-17 12:52:00 +02:00
WinfieldSteve
d7bc866c7c No second spawn broadcast necessary 2016-01-17 11:23:42 +01:00
LogicParrot
1379b92edf Fixed wrong knockback direction after explosion damage 2016-01-16 18:48:07 +02:00
LogicParrot
bc4a6ec3ea Merge pull request #2877 from LogicParrot/spawn2 
Fixed non-natural spawning near player (egg, breeding, etc.)
 2016-01-16 17:02:06 +02:00
LogicParrot
ac2c79f797 Fixed non-natural spawning near player (egg, breeding, etc.) 2016-01-16 16:40:47 +02:00
LogicParrot
8c12227687 Fix crash when tamed wolf is hit by arrows 2016-01-16 16:37:37 +02:00
LogicParrot
5ca2f4fd0c Merge pull request #2875 from LogicParrot/fallDamage 
Fix fall damage crash when tamed wolves neabry
 2016-01-16 11:56:19 +02:00
LogicParrot
0601adba25 Fix fall damage crash when tamed wolves neabry 2016-01-16 11:29:11 +02:00
bibo38
41aa7cf123 Limited the username length to 16 characters. 
This fixes a client crash, because Minecraft requires that a username is not longer than 16 characters.
See also: http://minecraft.gamepedia.com/The_Player#Name
Fixes #2545
 2016-01-13 09:55:48 +01:00
LogicParrot
e77af000df Do not spawn mobs too close to player 2016-01-12 15:47:13 +02:00
LogicParrot
062b51c822 Merge pull request #2862 from LogicParrot/creeper 
Fixed creeper calling TargetIsInRange with null m_Target
 2016-01-12 15:42:39 +02:00
LogicParrot
3a24ed4b61 Fixed creeper calling TargetIsInRange with null m_Target 2016-01-12 15:26:51 +02:00
LogicParrot
41f2b6c99f Fixed crash introduced by #2821 2016-01-12 15:13:53 +02:00
LogicParrot
d4e99aedb1 Merge pull request #2859 from LogicParrot/attack2 
Fix mob attack interval
 2016-01-12 14:46:02 +02:00
LogicParrot
21df3cb0d8 Fix mob attack interval 2016-01-12 14:20:17 +02:00
LogicParrot
e0f13f9f26 Friendly wolf attack safety checks 2016-01-12 13:27:03 +02:00
LogicParrot
e2a053263f Merge pull request #2857 from LogicParrot/wolf 
AI: Tamed wolf defends owner
 2016-01-12 12:13:36 +02:00
LogicParrot
359e772dee Tamed wolf assists owner (attack / defence) 2016-01-12 11:47:59 +02:00
Mattes D
e4adf2f9ae Added detailed logging to cBlockArea::Read() bad Y coords. 
Ref.: http://forum.mc-server.org/showthread.php?tid=2307
 2016-01-12 10:19:44 +01:00
Lukas Pioch
fe72eaaec2 Exported GetSeed to lua and added file extension opendb to .gitignore. 2016-01-12 10:18:24 +01:00
LogicParrot
a4a17a2953 Merge pull request #2821 from LogicParrot/world2 
Fix pre - #2815 default world linkage configs
 2016-01-12 10:24:44 +02:00
worktycho
7aa0b7299d Merge pull request #2855 from bibo38/mobheads 
Changed the format of the MobHead data
 2016-01-11 23:52:25 +00: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
Austin Martin
8c7cc3ffe9 Fixed issue #2218 2016-01-10 20:53:02 -05:00
Mattes D
725db4475c Added "core.help" permission to Default rank. 2016-01-10 17:40:25 +01:00
bibo38
a45315ee74 Fixed not working packet decompression 
A compressed packed contains always the uncompressed size, but in the code this size was threatened as the compressed data size. This created a failure, when the client compressed a packet.
See: http://wiki.vg/Protocol#With_compression
Fixes #2841
Fixes #2467
 2016-01-10 15:16:29 +01:00
Mattes D
491dbda7d3 Fixed Clang warnings. 2016-01-06 16:20:12 +01:00
Mathias
d17c8fa349 Fixed typo 2016-01-03 16:29:04 +02:00
Mathias
8e2b2e7a18 More blocks that can't be mined with silktouch 2016-01-03 16:27:02 +02:00
Arnaud Meuret
e19109465d Fix typo (ammount) 2016-01-02 22:02:02 +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
Mattes D
6c9be8df4b Fixed default Nether generator params. 
The prefab file is "NetherFort"
 2015-12-30 13:37:28 +01:00
Mattes D
0054104017 Fixed problems in cBlockingSslClientSocket. 2015-12-30 13:00:02 +01:00
Mattes D
902f428342 Fixed the monster burn code. 
The old code failed when the monster was out of Y range.
 2015-12-30 01:15:13 +01:00
Mattes D
78eb4c8ed8 Removed excessive logging in redstone simulator. 2015-12-28 11:06:41 +01:00
LogicParrot
fc8a117a0c Deleted cPath::BlockTypeIsFence 2015-12-27 16:13:44 +02:00
Safwat Halaby
bfafc39576 Merge pull request #2814 from SafwatHalaby/chunk2 
Freeze player until chunk is loaded
 2015-12-26 21:08:12 +02:00
worktycho
b99b60720a Merge pull request #2820 from cuberite/UrlParser 
Added the cUrlParser class, exported to Lua API.
 2015-12-26 19:01:37 +00:00
Mattes D
958df6ad91 Added the cUrlParser class, exported to Lua API. 2015-12-25 18:50:25 +01:00
Safwat Halaby
687d1816c4 Update fences and gates list 
Update fences and gates list
 2015-12-25 19:19:22 +02:00
Safwat Halaby
400f875918 Freeze player until chunk is loaded 2015-12-25 17:47:06 +02:00
Safwat Halaby
6a22605fae Merge pull request #2795 from SafwatHalaby/doors 
"Special blocks" handling
 2015-12-25 15:03:39 +02:00
Safwat Halaby
74912a2aaf Fix pre - #2815 default world linkage configs 2015-12-25 14:59:54 +02:00
Safwat Halaby
b4649248d1 Nether and End in settings.ini by default, and created at startup 2015-12-25 13:49:13 +02:00
Safwat Halaby
87b2d60a0e Merge pull request #2816 from SafwatHalaby/redstone 
Silenced the Redstone Simulator console spam
 2015-12-24 18:57:34 +02:00
Safwat Halaby
75fea3cd1e Silenced the Redstone Simulator console spam 2015-12-24 17:58:34 +02:00
Mattes D
122d824a8a Added a Json parser and serializer to Lua API. 2015-12-24 14:00:31 +01:00
Safwat Halaby
dfeced18b2 PF - "Special blocks" handling 2015-12-24 06:20:16 +02:00
Julian Laubstein
d319c9dd58 Added IsBlockFence method to defines 2015-12-24 00:05:49 +01:00
Julian Laubstein
2713577dbf Fixed builds on FreeBSD 32bit 2015-12-23 17:13:47 +01:00
Safwat Halaby
7285a43cf6 Merge pull request #2806 from SafwatHalaby/gargraj-chicken 
[Gargaj] - Baby chickens don't lay eggs
 2015-12-23 16:31:35 +02:00
Safwat Halaby
1ccf7d9c8a Chicken egg code early bailout 2015-12-23 15:57:26 +02:00
Gargaj
fd2edf3ecf Baby chickens don't lay eggs 2015-12-23 15:54:07 +02:00
Mattes D
8422ada77f Fixed return value description in doxycomment. 2015-12-23 14:17:04 +01:00
Gargaj
8968a7174e add handling of water bottle 2015-12-22 20:25:59 +01:00
worktycho
76cd723867 Added GeoTrust Root Certificate 2015-12-22 16:08:02 +00:00
worktycho
ecb94e0dc6 Ignore == if followed by \ 
Ignore the space before == rule if immediately followed by a \. If it is imediatly followed by a \, then this is likely the base64 padding at the end of a certificate, which is followed by \n.
 2015-12-22 16:08:02 +00:00
Safwat Halaby
d112632d6a Merge pull request #2788 from SafwatHalaby/jump 
PF - Improved mob jumping
 2015-12-22 07:42:28 +02:00
then0rTh
4d264b8b33 cTeam:GetName returning wrong name 2015-12-21 20:25:33 +01:00
Safwat Halaby
8b4530740e PF - Improved mob jumping 2015-12-21 20:00:25 +02:00
Safwat Halaby
b4874d213c Revert "Changed cPath to have a reset method". 2015-12-21 16:47:43 +02:00
Lukas Pioch
938833bd6b Fixed spawn point. Wrong number for divisions and wrong highest spawn point. 2015-12-20 13:05:43 +01:00
tycho
d4289eee3c Fix race condition 2015-12-20 00:56:55 +01:00
Lukas Pioch
50a908fdc9 Fixes for clang-3.7 2015-12-19 22:43:37 +01:00
Tiger Wang
b8752bb26e Merge pull request #2542 from Haxi52/pinkstone 
Reorganised the redstone simulator
 2015-12-19 21:20:56 +00:00
tycho
d01562cb7d Use atomic bool for isthread terminate 2015-12-19 19:29:06 +01:00
Alexander Harkness
8b851d5048 Added HTTPS links wherever they are supported. 2015-12-19 14:30:32 +00:00
worktycho
1ee61c4f23 Fix off by two error in ReadString 2015-12-18 15:53:41 +00:00
tycho
456253c651 Check for invalid tags when reading a compound tag 2015-12-18 15:20:24 +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
Mattes D
086c8b1834 Revised the explosion-related Lua API and docs. 
Fixes #2746.
 2015-12-18 12:40:34 +01:00
Mattes D
d135e49451 Removed unused class cChunkDataCollector. 2015-12-18 12:24:47 +01:00
tycho
9e6161305d Fixed String Parsing crash bug 
Check string length against actual remaining data, not an abitary constant
 2015-12-18 12:08:55 +01:00
Mattes D
f060d9f9b0 PieceStructures generator: Fixed wrong merge conflict resolution. 
Also improved reporting messages.
Ref.: http://forum.mc-server.org/showthread.php?tid=2256
 2015-12-17 19:33:12 +01:00
Lukas Pioch
d620dcdd08 Moved variables into scope, removed unused variables and fixed variables 2015-12-17 10:48:36 +01:00
Safwat Halaby
3c1f9e8a3a Merge pull request #2753 from cuberite/pathFix 
Path fix
 2015-12-16 18:39:23 +02:00
tycho
2c0ca0b4c3 Changed cPath to have a reset method. 
Also reverts "Changed raw cPath to an unique_ptr, fixes memory leak"

This reverts commit 1515d37684.
 2015-12-16 10:49:42 +00:00
Gargaj
68ff0edfde allow horse control (still quite buggy) 2015-12-15 21:14:27 +01:00
tycho
0fb8646198 Delete copy and move constructors from cPath 
cPath is not safe to copy or move due to pointers into the std::map m_Map.
 2015-12-15 19:18:58 +00:00
Julian Laubstein
5af10b8cd3 Fixed warning regarding an uninitialized value 2015-12-15 17:20:34 +01:00
Julian Laubstein
8d5f4f2160 Fixed warning regarding an uninitialized value 2015-12-15 17:06:32 +01:00
Lukas Pioch
1515d37684 Changed raw cPath to an unique_ptr, fixes memory leak 2015-12-15 01:16:36 +01:00
worktycho
1e5ba8a1bb Merge pull request #2638 from Gargaj/master 
Implement block heights + adapt ground checks
 2015-12-14 20:31:33 +00:00
Julian Laubstein
378b2b8ca6 Strip meta from hopper on converting to pickup 2015-12-13 15:46:43 +01:00
Gargaj
66e6589883 blockheight mechanism 2015-12-13 15:16:15 +01:00
Safwat Halaby
1540867cb5 Set overgrown wart age to 3 2015-12-13 15:55:09 +02:00
Gargaj
f9008a4860 allow use failures to propagate from the entity/block to the player 2015-12-13 13:27:38 +01:00
Gargaj
e31676fe50 snow golems are "neutral" 2015-12-13 13:13:37 +01:00
Gargaj
0eb519b35a sheep color inheritance 2015-12-13 13:04:18 +01:00
Safwat Halaby
4851f5e2c9 Remove stray "return" 2015-12-13 08:04:41 +02:00
Safwat Halaby
91aec448eb Fixed mobs attacking Creative Mode players 2015-12-13 07:52:11 +02:00
Safwat Halaby
8a5df43e6c Decoupled cMonster and path recalc logic, re-implemented recalc 2015-12-13 07:13:34 +02:00
Gargaj
62265a0850 Stop pathfinding over cobble walls 
Also 1.5 blocks high, shouldn't pathfind over it.
 2015-12-13 00:02:56 +01:00
Gargaj
115865f845 Nether wart only ages to 3 
See http://minecraft.gamepedia.com/Nether_Wart
 2015-12-12 00:46:01 +01:00
Gargaj
d05fdbdee9 Test for correct coordinates when fishing 
Fun fact: this was able to actually deadlock the server depending on where you were standing :)
 2015-12-10 20:54:55 +01:00
Mattes D
b8fe09901b Fixed opposite condition in OreNests finisher. 2015-12-09 08:03:33 +01:00
Gargaj
86ea2ee50c stop creepers from exploding even if they just died 2015-12-08 22:34:32 +01:00
Julian Laubstein
d75ab544f4 Small spelling issues fixed 2015-12-08 21:58:53 +01:00
Gargaj
41761624c2 Tilling dirt should send block update 
There are BUD switches that are built on this (https://www.youtube.com/watch?v=Bk_ChvmtCNY) but more prominently, torches placed on dirt blocks should pop off when the dirt block is tilled.
 2015-12-06 12:59:38 +01:00
Gargaj
4132ff495c Spawn chickens from eggs as babies 
This actually works now with the breeding patch (would also close https://github.com/cuberite/cuberite/pull/2366)
 2015-12-05 15:54:34 +01:00
Gargaj
7a7cc1e66f fix wolf collars 
I don't know why this had an inversion but it consistently made the wrong collar color (i.e. yellow dye made the collar blue)
 2015-12-03 15:13:03 +01:00
Mattes D
ef7c6ea7e7 Merge pull request #2707 from Gargaj/rabbitstew 
Merge cItemMushroomSoupHandler into cItemFoodHandler
 2015-12-03 15:12:07 +01:00
Gargaj
72b2ab6406 Merge mushroom soup into generic food handler 
...and fix eating the bowl when eating rabbit stew
 2015-12-03 14:55:32 +01:00
Mattes D
03a972ec55 Use C++11 auto instead of per-platform types. 
Closes #2686.
 2015-12-03 14:39:36 +01:00
Mattes D
213419a4cc Merge pull request #2699 from SafwatHalaby/breedDocs 
Breeding documentation
 2015-12-03 13:57:58 +01:00
Mattes D
3de22f5183 Changed Nether defaults to use PieceStructures. 2015-12-01 11:39:02 +01:00
Mattes D
2c3d933349 Added more details to the cubeset format documentation. 2015-12-01 10:35:08 +01:00
Mattes D
b8fbba5eb9 Added PieceStructures generator. 2015-12-01 10:35:07 +01:00
Safwat Halaby
dbda48ead4 Added documentation for breeding code 2015-11-30 12:05:38 +02:00
Gargaj
4ae3b64b07 implement breeding 2015-11-29 20:14:28 +01:00
Mattes D
851ee6a27f Normalized OrePockets generator config names. 
All INI values use AllInitialCapsStyle, no underscores.
 2015-11-27 12:44:42 +01:00
Mattes D
326f5e04f7 OrePockets finisher is now configurable. 2015-11-25 15:06:32 +01:00
Mattes D
f2a8d5c047 Added OrePockets and DirtPockets finish gens. 2015-11-25 09:22:20 +01:00
Gargaj
1fb89a5409 fix escaped characters in signs (fixes #1736, fixes #2170) 2015-11-24 19:51:39 +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
Gargaj
853e6e6882 change from single followable item to multiple 2015-11-23 22:20:31 +01:00
Julian Laubstein
5d5f5c9fba Fixed display of helpmessage 2015-11-23 18:20:37 +01:00
Julian Laubstein
9d07be62d3 Changed static_cast to FloorC 2015-11-23 18:10:58 +01:00