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
94dc3e19fe
Merge pull request #2189 from mc-server/MSVCWarningFixes
...
Fixed warnings in MSVC.
2015-06-02 14:50:31 +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
Alexander Harkness
150be79443
Merge pull request #2178 from jammet/patch-7
...
Fix Daylightsensor recipe
2015-06-01 07:31:16 +01:00
jammet
ff55294583
Update crafting.txt
2015-05-31 23:41:00 +02:00
Mattes D
4f086b37d2
Merge pull request #2180 from mc-server/CraftingFix
...
Fixed crafting recipe matching.
2015-05-31 22:16:34 +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
jammet
80bf058c90
Fix Daylightsensor recipe
...
Something like Woodslap^-1 didn't work here, so I split it up into individual recipes.
2015-05-31 18:54:49 +02:00
Alexander Harkness
ddb173b289
Merge pull request #2173 from mc-server/CleanCmake
...
Moved shared cmake flags to the CMAKE_C_FLAGS var
2015-05-30 14:07:18 +01:00
tycho
9b798ff9dd
Merge branch 'master' of github.com:mc-server/MCServer
2015-05-30 13:34:08 +01:00
tycho
d5c89eceb8
Moved shared cmake flags to the CMAKE_C_FLAGS var
2015-05-30 13:32:22 +01:00
Alexander Harkness
4504ec7a67
Updated MagicCarpet submodule. Fixes #2155
2015-05-30 13:06:46 +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
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
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