flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
8,903 Commits 1 Branch 0 Tags 92 MiB
6cd71a1e73
Commit Graph

4465 Commits

Author SHA1 Message Date
tycho
bfe52277b4 Rewrote ChunkSending queue for significantly improved performance 2015-06-05 22:31:21 +01:00
tycho
19c95ee564 Moved Chunk Broadcasts over to the regular queue 2015-06-05 22:31:21 +01:00
Anthony Birkett
9dac390247 Daemon support on Linux. 
Added null console log listener, avoid printf() when stdout is closed.
 2015-06-05 15:47:47 +01:00
worktycho
519fd1d36d Merge pull request #2206 from mc-server/APIDumpTimeStamp 
APIDump time stamp
 2015-06-05 13:04:28 +01:00
Mattes D
1ec9665118 Fixed overshoot in cLineBlockTracer. 
Fixes #2161.
 2015-06-05 11:29:54 +02:00
Mattes D
99b182b4be Added Build info to the cRoot API. 2015-06-05 10:34:13 +02:00
Mattes D
649921f4a8 Provide some BuildInfo even for non-CI builds. 
Ref.: #2204
 2015-06-05 10:19:58 +02:00
Mattes D
5267285529 Merge pull request #2069 from HaoTNN/master 
Fixes lit furnace issue in #2051
 2015-06-05 10:12:10 +02:00
worktycho
c9ad1ecd3e Merge pull request #2203 from jan64/master 
Change SendChatType behavior for < 1.8 clients, update docs
 2015-06-04 11:28:43 +01:00
Cengiz Can
c967698b2d Skip unknown cflag for Apple clang & remove cSemaphore 2015-06-04 11:48:56 +03:00
jan64
fd964200b2 Changed SendAboveActionBarMessage / SendSystemMessage to be a noop for < 1.8 clients 2015-06-03 18:11:12 +02:00
HaoTNN
6f1a3cb6dd Merge remote-tracking branch 'upstream/master' 2015-06-03 02:57:07 -07:00
HaoTNN
e82cd6e4eb Fixes multiple furnace issues, including from loading world storage 2015-06-03 02:19:22 -07:00
Mattes D
1f2c9b226c Merge pull request #2199 from jan64/master 
Added system and above action bar chat messages
 2015-06-03 09:49:28 +02:00
HaoTNN
3142598dee Merge branch 'master' of https://github.com/mc-server/MCServer 2015-06-02 16:08:57 -07:00
jan64
d37e0eb72b Added system and above action bar chat messages 2015-06-02 19:59:46 +02:00
Mattes D
a0a8e78c0d Added cmdline params for crashdump detailness. 
Win32-only, also fixed the call scripts.
Fixes #2184.
 2015-06-02 15:19:13 +02:00
Mattes D
a42daecd0b Merge pull request #2182 from birkett/master 
Use the new style command line parameters for Windows Service support.
 2015-06-02 15:05:05 +02:00
Mattes D
48c153bf53 Fixed warnings in MSVC. 
It complained about undefined return values or using uninitialized variables.
 2015-06-02 12:51:43 +02:00
Anthony Birkett
65a62601dc Use the new style command line parameters for Windows Service support. 
Ignore invalid or malformed command line parameters, prevent unhandled exceptions.
NOTE: Users will need to reinstall the service, now uses "-d" instead of "/service" in the start parameters.
 2015-06-01 14:41:06 +01:00
Mattes D
a54fa15bc6 Merge pull request #2172 from mc-server/LightingCallbacks 
Made cLightingThread own its callbacks
 2015-06-01 15:02:42 +02:00
Mattes D
25e83bc1d9 Fixed crafting recipe matching. 
Fixes #2096.
 2015-05-31 21:21:57 +02:00
Mattes D
98df75d5ab ManualBindings: Fixed DoWithXYZ and ForEachInChunk signatures. 
Fixes forum report http://forum.mc-server.org/showthread.php?tid=1993
 2015-05-31 19:44:08 +02:00
tycho
9b798ff9dd Merge branch 'master' of github.com:mc-server/MCServer 2015-05-30 13:34:08 +01:00
tycho
bca13d9187 Fixed minor cast warning 2015-05-30 12:31:05 +01:00
Alexander Harkness
28bab37425 Fixed wrong indent. 2015-05-30 11:22:49 +01:00
Alexander Harkness
97ee861c20 Merge pull request #2171 from SafwatHalaby/fence 
PF - Handle all fencetypes
 2015-05-30 11:13:59 +01:00
tycho
06a74e45e2 Made cLightingThread own its callbacks 2015-05-30 11:11:17 +01:00
worktycho
b371208526 Merge pull request #2163 from mc-server/SimplifySpawn 
Clean up Spawn Prepare
 2015-05-30 10:59:52 +01:00
SafwatHalaby
5f7455bc19 PF - Handle all fencetypes 2015-05-30 12:49:49 +03:00
worktycho
2ce405883a Merge pull request #2169 from linnemannr/master 
Fix FreeBSD/clang errors caused by -Werror
 2015-05-30 10:32:35 +01:00
worktycho
2b51958c85 Merge pull request #2167 from SafwatHalaby/diags 
PF - Fixed diagonal cutting
 2015-05-30 10:28:37 +01:00
linnemannr
ee34e7131a Fix FreeBSD/clang errors caused by -Werror 
With FreeBSD/clang, -Werror combined with the configured warning flags yields
some fatal errors, specifically related to signed conversion, 64 to 32 bit
conversion, and tautological compares.

CONTRIBUTORS

	Add myself to the contributor list

src/Generating/FinishGen.cpp

	In cFinishGenPassiveMobs::GetRandomMob(), change the type of RandMob
	from size_t to the difference_type of the ListOfSpawnables iterator
	MobIter. Using size_t triggers a 64 bit to 32 bit conversion if the
	difference_type of the iterator class is 64 bit

	Also explicitly cast the noise expression to unsigned long so we don't
	get a signed conversion warning from the modulo against
	ListOfSpawnables.size()

src/OSSupport/StackTrace.cpp

	FreeBSD 10 and above includes a non glibc implementation of benchmark()
	for which size_t, not int, is the return type. To account for this and
	prevent a signed conversion warning, abstract the type for numItems with
	a macro btsize

src/StringUtils.h

	In StringToInteger(), correct a tautological compare warning for
	unsigned types with the template. If T is unsigned, comparing
	std::numeric_limits<T>::min() to the unsigned result is always
	false. That control can enter this branch in an evaluated template with
	an unsigned type T may also permit a signed number to be parsed and
	erroneously stripped of its signedness at runtime. To guard against this
	and avoid the warning in the case that the number parsed from the string
	is non-positive, return false and don't try to parse if T is unsigned
	and control enters the non-positive branch
 2015-05-30 02:23:57 -06:00
SafwatHalaby
d9f5d3c858 PF - Fixed diagonal cutting 2015-05-30 10:50:04 +03:00
Safwat Halaby
054d2cd451 Merge pull request #2166 from SafwatHalaby/squid 
Disabled squid and Guardian Pathfinding
 2015-05-30 10:31:26 +03:00
SafwatHalaby
a0f4e182b1 Disabled squid and Guardian Pathfinding 2015-05-30 10:04:27 +03:00
SafwatHalaby
9c6c6af75a Fixed creeper explosions 2015-05-30 09:54:32 +03:00
Tiger Wang
291370e367 Fix Destroy() calling behaviour 
* Fixes Core/#142
 2015-05-30 00:23:34 +01:00
tycho
4feccaa64a Clean up Spawn Prepare 
Made cSpawnPrepare execute on the same thread since it is a syncronous operation, and most of the code happens on the lighting thread.
Also moved cSpawnPrepare into its own file
 2015-05-30 00:19:20 +01:00
Lane Kolbly
1dfc7bbce2 Fixed reversed logic in StringToDimension. 2015-05-30 00:02:43 +01:00
Julian Laubstein
1e6f02437e Merge pull request #2070 from mc-server/PreventNewWarnings 
Fixed a lot of warnings
 2015-05-29 11:08:32 +02:00
b33duck
022348645e Fix for the way connecting clients receive player lists and broadcast chat 2015-05-28 19:43:16 -07:00
tycho
4956e8700d Merge branch 'master' into PreventNewWarnings 
Conflicts:
	src/Entities/ArrowEntity.cpp
 2015-05-29 00:12:56 +01:00
SafwatHalaby
f1540173da AI - Sane Skeleton 2015-05-28 19:19:56 +03:00
Tiger Wang
20b7152572 Potential crash fixes 
* Potentially addresses my comment in #1969
* Probably fixes #2145
 2015-05-28 13:03:28 +01:00
tycho
b2fa71a32a Fix comments 2015-05-28 12:54:04 +01:00
tycho
e19693e529 Merge branch 'master' into PreventNewWarnings 
Conflicts:
	src/Inventory.cpp
 2015-05-28 11:05:41 +01:00
SafwatHalaby
b936781f93 AI - Tweaked wolf speed and teleport threshold 2015-05-28 08:31:17 +03:00
worktycho
7c028b87bc Merge pull request #2148 from SafwatHalaby/easy 
AI - Saner Livestock
 2015-05-27 17:46:11 +01:00
SafwatHalaby
52fcbb5c65 AI - Saner Livestock 2015-05-27 19:26:08 +03:00
Alexander Harkness
da4a76bb50 Merge pull request #2061 from mc-server/fixes 
Fixes
 2015-05-27 12:21:17 +01:00
tycho
31b95afd79 Fixed ClientHandle not getting properly removed from the world 
when socket is closed whilst the client is being added to the world
Fixes #1969
 2015-05-26 10:34:14 +01:00
Mattes D
c3c30a78e1 Merge pull request #1848 from scottwillmoore/ImplementTitleCommand 
Implement backend for /title command
 2015-05-26 08:46:16 +02:00
Mattes D
35c40bd9eb Merge pull request #2138 from Seadragon91/server_uptime 
Added method to get the uptime of the server in seconds.
 2015-05-26 07:59:10 +02:00
Lukas Pioch
c3b872ad93 Added method to get the uptime of the server in seconds. Implements #1650. 2015-05-26 05:36:46 +02:00
worktycho
6735b0d534 Only add default plugins if there are not any plugins 
Fixes #2082
 2015-05-25 18:43:18 +01:00
Alexander Harkness
150024265e Merge pull request #2135 from linnemannr/master 
Support building on FreeBSD
 2015-05-25 07:07:18 +01:00
linnemannr
5049fd0fbf Support building on FreeBSD 
SetFlags.cmake

	Add -lexecinfo to linker flags for FreeBSD to resolve backtrace()

lib/sqlite/CMakeLists.txt

	Define _XOPEN_SOURCE to 600 instead of __POSIX_VISIBLE to 200112 for
	POSIX 1-2001 support. For POSIX standards, the _XOPEN_SOURCE define
	controls the eventual value of __POSIX_VISIBLE. _XOPEN_SOURCE is defined
	to 500 in sqlite.c if not already defined, which sets up _POSIX_C_SOURCE
	and __POSIX_VISIBLE to the 199506 for POSIX.1c

lib/tolua++/CMakeLists.txt
src/CMakeLists.txt

	Add /usr/local/lib to the library search path for FreeBSD builds

src/OSSupport/Errors.cpp

	Correct the strerror_r() implementation determination to check whether
	_GNU_SOURCE is defined, not what it evaluates to
 2015-05-24 20:07:31 -06:00
tycho
d1c9122340 Fix warnings in cPath 2015-05-24 17:47:15 +01:00
tycho
a6ccee5948 Merge branch 'master' into PreventNewWarnings 2015-05-24 17:27:05 +01:00
tycho
5ab650e4bb Fix bearbins comments 2015-05-24 15:25:52 +01:00
tycho
76a3165f09 Fix comments 2015-05-24 14:58:24 +01:00
tycho
95b81b3ef1 Disable -Werror for warnings in tests. 2015-05-24 14:16:05 +01:00
worktycho
bd95d7bf7b Merge pull request #2091 from Rakete1111/master 
Placing buckets up to 25 blocks away #2059
 2015-05-24 13:44:34 +01:00
Tiger Wang
10c9e66aad Fixes #2041 2015-05-24 13:37:36 +01:00
tycho
dae9e5792a Made -Weverything an error. 2015-05-24 12:56:56 +01:00
worktycho
d86e8fae79 Merge pull request #2122 from SafwatHalaby/bounding 
Pathfinder - Bounding boxes and some tweaks
 2015-05-24 12:51:15 +01:00
Safwat Halaby
79c3e11a31 Merge pull request #2118 from mc-server/login-gamemode 
Fix gamemode not changing properly.
 2015-05-24 09:52:45 +03:00
Alexander Harkness
45012b72e7 Wolves don't spawn in rivers. 2015-05-24 07:28:17 +01:00
HaoTNN
2578afb244 Merge remote-tracking branch 'upstream/master' 2015-05-23 14:06:37 -07:00
SafwatHalaby
7021547e99 Pathfinder - Bounding boxes and some tweaks 2015-05-23 22:16:19 +03:00
Safwat Halaby
042c08d7e3 Merge pull request #2107 from mc-server/cow-waterspawn 
Cows no longer spawn over water.
 2015-05-23 22:11:34 +03:00
Alexander Harkness
febc8529b1 Fix gamemode not changing properly. 
Should fix #604
 2015-05-23 19:31:33 +01:00
tycho
81c0116cf1 Merge branch 'master' into PreventNewWarnings 2015-05-23 07:33:52 -07:00
worktycho
7e0dc0f9bc Merge pull request #2117 from Seadragon91/clang_errors 
Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher.
 2015-05-23 15:31:49 +01: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
b29ae54d91 Merge branch 'master' into PreventNewWarnings 2015-05-23 06:50:28 -07:00
tycho
a5624debcb Fix tests 2015-05-23 13:21:02 +01:00
Mattes D
dbf5fed2bc Merge pull request #2065 from mc-server/OldArgs 
Move some of the old arguments over to TCLAP
 2015-05-23 13:05:16 +02:00
Alexander Harkness
3a27fabbab Merge pull request #2103 from beeduck/Issue1980 
Fixed players head visible when in spectator mode
 2015-05-23 11:56:39 +01:00
tycho
1577a080ee Merge branch 'master' into PreventNewWarnings 2015-05-23 11:31:03 +01:00
worktycho
26c9c34780 Fixed wrong copy/paste 
Fixes CID 110962
 2015-05-23 11:30:15 +01:00
Alexander Harkness
abf6ac3148 Cows and rabbits no longer spawn over water. 
Fixes #2080
 2015-05-23 10:38:57 +01:00
Alexander Harkness
de5e056a88 TryGetHeight returns a bool 
should fix #2099
 2015-05-23 10:37:50 +01:00
Alexander Harkness
e0fd3ce95b Merge pull request #2101 from mc-server/EquifaxCerts 
Close Ssl Socket on destroy
 2015-05-23 07:28:36 +01:00
Alexander Harkness
31f66fd812 Merge pull request #2104 from beeduck/Issue2053 
Fix for players falling through world when loading in as spectator
 2015-05-23 07:27:04 +01:00
SafwatHalaby
f983bb6234 Fixed creeper not exploding when 1 block higher than player 2015-05-23 09:06:00 +03:00
b33duck
afb96c5bd6 Added a fix for players falling through the world when connecting in spectator mode 2015-05-22 16:33:11 -07:00
Tiger Wang
8f6788b2ef Close Ssl Socket on destroy 
* Fixes #2072
 2015-05-22 23:54:32 +01:00
b33duck
906288c6eb Fixed players head visible when in spectator mode 2015-05-22 12:25:16 -07:00
Blitz Rakete
e512b7bf8e Fixes #2059 2015-05-21 19:03:51 +02:00
Mattes D
6bafff0560 Merge pull request #2086 from Seadragon91/master 
Renamed hook HOOK_ENTITY_CHANGE_WORLD
 2015-05-21 12:57:25 +02:00
Lukas Pioch
bc838e5bd2 Renamed hook HOOK_ENTITY_CHANGE_WORLD 2015-05-21 12:27:54 +02:00
Mattes D
90ab8a338b Added Equifax root CA. 
Fixes #2076.
Closes #2081.
Ref.: #2072.
 2015-05-21 10:26:45 +02:00
worktycho
c0d7b4d569 Merge pull request #2030 from beeduck/master 
Issue #1868 and Issue #1984
 2015-05-21 07:50:30 +01:00
Alexander Harkness
6202fdafe7 Merge pull request #2084 from mc-server/patch-2050 
Added missing fencetypes to torchhandler
 2015-05-21 07:02:10 +01:00
b33duck
ed3c0b771f Added open/close and sound effects for all door types 2015-05-20 16:24:16 -07:00
b33duck
a511db78ca Added thunder sound effect to CastThunderbolt() 2015-05-20 16:23:56 -07:00
Julian Laubstein
48b7874099 Added missing fencetypes to torchhandler 2015-05-20 23:18:21 +02:00
SafwatHalaby
8436e5d8bd Path recalculation improvements 2015-05-20 20:42:35 +03:00