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
Alexander Harkness
0afdbeab29
Merge pull request #2165 from SafwatHalaby/creeper
...
Fixed creeper explosions
2015-05-30 08:05:56 +01: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
Mattes D
6adf5f5e00
Merge pull request #2157 from beeduck/Issue2106
...
Fix for chat and player lists with players in separate worlds
2015-05-29 10:57:31 +02:00
b33duck
009caefbbe
Merge branch 'Issue2106' of https://github.com/beeduck/MCServer into Issue2106
2015-05-28 19:49:54 -07: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
STRWarrior
15d49d0cb9
Fixed Info.lua documentation
...
The AdditionalInformation table is called AdditionalInfo
2015-05-28 22:22:59 +02:00
b33duck
c8b1778847
Fixed the way connecting clients receive player lists and broadcast chat to worlds
2015-05-28 13:17:21 -07:00
STRWarrior
e7214dff65
Updated DumpInfo plugin.
...
cPluginManager:GetAllPlugins is deprecated
2015-05-28 22:12:12 +02:00
worktycho
b135ab8b95
Merge pull request #2154 from SafwatHalaby/skeleton
...
AI - Sane Skeleton
2015-05-28 20:51:26 +01:00
Safwat Halaby
26058e647b
Merge pull request #2156 from SafwatHalaby/exit
...
Removed stray "exit" from compile.sh
2015-05-28 22:39:58 +03:00
SafwatHalaby
e6ba181bd4
Removed stray "exit" from compile.sh
2015-05-28 22:39:39 +03:00
SafwatHalaby
f1540173da
AI - Sane Skeleton
2015-05-28 19:19:56 +03:00
Mattes D
a253f8d1a2
Merge pull request #2152 from mc-server/fixes
...
Potential crash fixes
2015-05-28 16:40:46 +02: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
8dcb5105c9
Update SQLite
2015-05-28 12:57:39 +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
Alexander Harkness
1487f57905
Merge pull request #2151 from SafwatHalaby/wolf
...
AI - Tweaked wolf speed and teleport threshold
2015-05-28 07:52:30 +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
Alexander Harkness
0fb7628e96
Merge pull request #2143 from jammet/patch-6
...
Corrected Cookie recipe
2015-05-26 18:41:33 +01:00
jammet
142a5dd05e
Corrected Cookie recipe
...
You should get a batch of 8 cookies for 2 wheat and one cocoabean.
2015-05-26 19:22:43 +02:00
Mattes D
1e297717e0
Merge pull request #2136 from mc-server/clientDestroyRace
...
Fixed ClientHandle not getting properly removed from the world
2015-05-26 17:01:57 +02: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
Julian Laubstein
4c01fc70ab
Merge pull request #2139 from mathias-github/patch-3
...
Adding myself to contributors
2015-05-26 00:26:47 +02:00
Alexander Harkness
fffc8dce21
Merge pull request #2140 from mc-server/Plugins-duping
...
Only add default plugins if there are not any plugins
2015-05-25 21:24:34 +01:00
worktycho
6735b0d534
Only add default plugins if there are not any plugins
...
Fixes #2082
2015-05-25 18:43:18 +01:00
Mathias
c6d2d1d715
Update CONTRIBUTORS
2015-05-25 20:23:02 +03:00
Alexander Harkness
150024265e
Merge pull request #2135 from linnemannr/master
...
Support building on FreeBSD
2015-05-25 07:07:18 +01:00