1
0
Commit Graph

4620 Commits

Author SHA1 Message Date
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
worktycho
eaedd5f19d Merge pull request #2074 from SafwatHalaby/rmUnique
Removed UniquePTR from PathFinder
2015-05-20 13:06:51 +01:00
tycho
d9d4adc2a5 Moved no buffering command line argument to tclap 2015-05-20 01:50:04 +01:00
tycho
7c196ffde6 Move commlog arguments over to TCLAP 2015-05-20 01:50:04 +01:00
HaoTNN
ac1bfd9671 Merge remote-tracking branch 'upstream/master' 2015-05-19 14:22:27 -07:00
worktycho
8026133078 Don't verify certificate
Temporary Hot-fix for #2072
2015-05-19 21:25:38 +01:00
SafwatHalaby
395f3d9c4c newlines 2015-05-19 22:47:48 +03:00
tycho
813c95d4b0 Merge branch 'master' into PreventNewWarnings 2015-05-19 19:40:39 +01:00
tycho
77f1f58c0a Make -Werror disabling file only
Ad fix a load of warnings
2015-05-19 19:32:10 +01:00
SafwatHalaby
0741ad3526 Removed UniquePTR from PathFinder 2015-05-19 21:07:05 +03:00
Alexander Harkness
0c06ec6abd Merge pull request #2057 from Seadragon91/master
Fix the health of animals
2015-05-19 18:02:43 +01:00
tycho
480052c058 Added LuaState support for all integral types
All so added error handling for out of range values
2015-05-19 17:09:05 +01:00
tycho
2bb25b8afa Fixed some more warnings 2015-05-19 15:21:29 +01:00
tycho
050a014106 Finish fixing windows 2015-05-19 14:02:02 +01:00
tycho
03c75943ea More fixed warnings 2015-05-19 13:34:52 +01:00
tycho
6cccd2aabb Properly fix cFile Warnings 2015-05-19 13:33:34 +01:00
tycho
fa4fb75e03 Fixed compile and a few more warnings 2015-05-19 12:28:31 +01:00
tycho
95e06ab93f Merge branch 'master' into PreventNewWarnings
Conflicts:
	src/Blocks/BlockLeaves.h
2015-05-19 11:55:23 +01:00
tycho
f2689c4887 Fixed a lot of warnings 2015-05-19 11:50:59 +01:00
Alexander Harkness
fff5efedc3 Merge pull request #2019 from mc-server/OverrideArgs
Initial Implementation of command line arguments
2015-05-19 10:53:44 +01:00
Alexander Harkness
2c0a11a8af Merge pull request #2060 from mc-server/more-leafimprove
Improved leaves a bit more.
2015-05-19 09:32:14 +01:00
Alexander Harkness
d852209f8d Manual merge of #2066 2015-05-19 09:29:27 +01:00
Alexander Harkness
b50135e78f Merge pull request #2064 from Seadragon91/hook_entity_change_world
Added hooks HOOK_ENTITY_CHANGE_WORLD and HOOK_ENTITY_CHANGED_WORLD
2015-05-19 09:24:50 +01:00
haotnn
6128e3f7cd Fixes lit furnace issue in #2051 2015-05-18 23:19:03 -07:00
Lukas Pioch
4d4d1e9c69 Added hooks HOOK_ENTITY_CHANGE_WORLD and HOOK_ENTITY_CHANGED_WORLD
Fixes #1435.
2015-05-18 22:29:39 +02:00
tycho
2e98bfc4e9 Add support for setting ports through command line 2015-05-18 17:26:12 +01:00
tycho
c2303ac4cf Fix max slots logic to only override if acctually present. 2015-05-18 15:43:26 +01:00
Tiger Wang
1632d5f8f1 Fixes #2003 2015-05-18 15:43:24 +01:00
Tiger Wang
0dbba305b6 Fixes #2052 2015-05-18 14:30:16 +01:00
Alexander Harkness
aedf9d05cb Improved leaves a bit more.
Should fix #2058.
2015-05-18 13:43:00 +01:00
STRWarrior
007bac638b Merge branch 'master' of https://github.com/mc-server/MCServer 2015-05-18 09:30:43 +02:00
Safwat Halaby
75d2f1a61b Merge pull request #2049 from mc-server/sapling-probability
Fix sapling probability.
2015-05-18 08:20:00 +03:00
Lukas Pioch
a75106aea7 Fix the health of animals 2015-05-18 06:36:52 +02:00
Safwat Halaby
b7b088494c Merge pull request #2037 from SafwatHalaby/aprox
Pathfinder - approximated paths when original destination unreachable
2015-05-17 23:21:52 +03:00
STRWarrior
b9481dafeb Updated the defaults for the overworld world generator 2015-05-17 19:36:18 +02:00
SafwatHalaby
29e31c5be9 Pathfinder - approximated paths when original destination unreachable 2015-05-17 19:36:52 +03:00
Alexander Harkness
1049d5b706 properly this time? 2015-05-17 16:30:13 +01:00
Alexander Harkness
adecdc2f07 Fixed typo. 2015-05-17 16:10:55 +01:00
Alexander Harkness
d48825fa81 Fix sapling probability.
Probability is 5% of leaves drop a sapling.

This should really be different for jungle leaves (2.5%) and the Fortune enchantment should increase the probability.
2015-05-17 14:23:16 +01:00
worktycho
c94134ec5e Fix FastRandom seeding
Fixes #1815
Fixes #2021
2015-05-17 13:16:18 +01:00
Mattes D
f3d6da29f7 Fixed inventory handling.
Fixes #2035.
2015-05-16 23:22:50 +02:00
Safwat Halaby
4ace226dcd Merge pull request #2033 from mc-server/BreakIntoDebugger
Lua: Break into ZBS debugger on API errors.
2015-05-16 22:59:42 +03:00
Alexander Harkness
c9880b9cb5 Fixed bad logic. 2015-05-16 16:58:43 +01:00
Alexander Harkness
bda9b3e342 Should Fix sign flipping.
Fixes #1118
2015-05-16 16:49:47 +01:00
Mattes D
1240c76cb4 Lua: Break into ZBS debugger on API errors. 2015-05-16 16:19:18 +02:00
Mattes D
0b536701b4 Merge pull request #2029 from mc-server/bedPatch
Bed uses bottom two bits for direction not three
2015-05-16 14:11:56 +02:00
tycho
36fe8ee5f5 Added deoxy comments 2015-05-16 12:46:43 +01:00
worktycho
6350e4f279 Bed uses bottom two bits for direction not three 2015-05-16 12:07:38 +01:00
worktycho
0da8c7392e Fix service Main 2015-05-16 10:47:04 +01:00
tycho
c96849f431 Move make_unique into a namespace to avoid ADL issues
this prevents VS finding std::make_unique for constructors that take types from std
2015-05-16 10:47:04 +01:00
tycho
b9efa02c80 Initial implementation of IniFile overloading 2015-05-16 10:46:51 +01:00
SafwatHalaby
4ffc6621a9 PathFinder uses UniquePtr for cell map. 2015-05-16 10:38:58 +02:00
worktycho
5c3a85fba1 Revert "PathFinder - smart pointers" 2015-05-15 18:54:45 +01:00
SafwatHalaby
a8878dd2b6 uniquePTR 2015-05-15 20:25:44 +03:00
Mattes D
163aebf8ca Fixed cPluginManager:ForEachCommand() and ForEachConsoleCommand()
The functions would leak one value on the Lua stack for each enumerated command.
Fixes #2017.
2015-05-14 19:46:18 +02:00
Mattes D
c3804f08c8 Merge pull request #2018 from mc-server/ProbDif
Fixed possible crash in cProbabDistrib
2015-05-14 17:23:23 +02:00
STRWarrior
67b6b71a5b Fixed possible crash in cProbabDistrib
It could divide through 0 which causes a crash
2015-05-14 16:49:13 +02:00
Mattes D
80f2e1eb66 Merge pull request #2010 from TwiddleStick/patch-2
Update World.cpp
2015-05-14 13:41:22 +02:00
Mattes D
43fecf48e3 Merge pull request #2006 from mc-server/ManualBindingsWorld
Moved cWorld manual bindings out into a separate file.
2015-05-14 08:15:40 +02:00
Martin Fahy
8f0f421ae4 Update World.cpp
Fixed minor typos in comments, simply trying to understand the code base to fix issue regarding no sound when lighting is produced, no change to actual code.
2015-05-13 23:05:44 -04:00
Mattes D
2cdc2a16e4 Fixed chat message manipulation by plugins.
Plugins, in their OnChat hook, can change the chat message sent by a player.
2015-05-13 18:45:29 +02:00
Mattes D
f36b00f4d4 All in-game commands go through the OnExecuteCommand hook.
Everything that has a slash at the beginning, doesn't matter if it is a registered command or not.
2015-05-13 18:31:01 +02:00
Mattes D
15771e4759 Moved cWorld manual bindings out into a separate file. 2015-05-13 11:30:57 +02:00
Mattes D
0686b55901 Merge pull request #2001 from mc-server/BindingsCleanup
Bindings cleanup
2015-05-12 10:29:55 +02:00
Mattes D
4b97569b3a ToLua now generates cLuaState::Push() and GetStackValue()
For classes exported through ToLua it generates the cLuaState::Push() and cLuaState::GetStackValue() functions, as well as the supporting forward declarations and typedefs.
Renamed virtual_method_hooks.lua to BindingsProcessor.lua since it no longer provides virtual method hooks and instead does additional processing when generating the bindings.
2015-05-12 09:20:54 +02:00
Tiger Wang
c10e83c02d Fixed creative click-outside
* Fixes #1995
2015-05-11 23:21:46 +01:00
Tiger Wang
30b17bcb97 Improved hoppers
* Fixes #1994
2015-05-11 22:58:27 +01:00
Mattes D
4083bc7005 AllToLua: Removed unneeded virtual method hooks. 2015-05-11 16:11:53 +02:00
Mattes D
dd10ffb63a OnExecuteCommand hook can override the command result (crXXX). 2015-05-10 23:11:30 +02:00
Mattes D
693ffb689c Exported cPluginManager:ExecuteConsoleCommand() to Lua API.
Fixes #1999.
2015-05-10 22:51:16 +02:00
Mattes D
6c53abed23 Call HOOK_EXECUTE_COMMAND even for unknown console commands.
This allows plugins such as Aliases to intercept even unknown commands.
2015-05-10 21:46:25 +02:00
Mattes D
b356419a07 StringUtils: Fixed StringSplitWithQuotes().
The function would crash when given a string that started with the delimiter.
2015-05-10 21:39:14 +02:00
Mattes D
cbb1eff17a Added the EntireCommand parameter to HOOK_EXECUTE_COMMAND.
Fixes #1996.
2015-05-10 21:37:46 +02:00
Tiger Wang
9c490293b8 Merge remote-tracking branch 'origin/master' into warnings
Conflicts:
	src/Mobs/Monster.cpp
	src/Vector3.h
2015-05-10 12:16:20 +01:00
Tiger Wang
11ef1fd24a Fixed some warnings and logic errors in Monster.cpp 2015-05-10 12:14:55 +01:00
wiseoldman95
8a576a0a35 PF - Less calcs per tick 2015-05-10 09:08:42 +03:00
Mattes D
756d310318 Added check against "Type const &" and "Type const *". 2015-05-09 12:58:56 +02:00
Mattes D
846d16315a CheckBasicStyle: checks spaces around * and &. 2015-05-09 12:58:55 +02:00
Mattes D
c13b1931ff More style checking.
Spaces around some operators are checked.
2015-05-09 12:58:54 +02:00
jammet
61300ab9ef Rabbit and cooked rabbit now stackable
And corrected the alphabetical ordering.
2015-05-09 12:56:23 +02:00
Mattes D
92b8cd2f2a Merge pull request #1956 from Tri125/master
Fixed Magma cube sound and spawn size
2015-05-09 12:44:57 +02:00
worktycho
e2e206d81b Fixed remaing pragmas 2015-05-09 10:59:08 +01:00
worktycho
4dcd9a9924 clang diagnostic not diagnostics
fixed clang pragmas
2015-05-09 10:55:40 +01:00
Alexander Harkness
049ff67416 Merge pull request #1973 from Tri125/QuartzStack
Fixed #1893 : Quartz can now stack
2015-05-09 06:58:29 +01:00
Tristan
4642a50d62 GetSizeName of cSlime and cMagmaCube is now static 2015-05-08 20:50:05 -04:00
worktycho
523db778d9 Merge pull request #1972 from Woazboat/CodeCleanup_refactored
Fixed compiler warning overrides in Vector3.h
2015-05-09 00:25:38 +01:00
Woazboat
eaba777a0e Fixed compiler warning overrides in Vector3.h 2015-05-09 01:15:45 +02:00
Tiger Wang
218010cd96 Fixed some Visual Studio warnings 2015-05-08 23:32:02 +01:00
worktycho
1cef39cb73 Move chunk position accesses after the chunk validity checks 2015-05-08 23:20:22 +01:00
Mattes D
9329c2c2cb Merge pull request #1945 from Woazboat/CodeCleanup_refactored
Small code cleanup - clean version
2015-05-08 21:52:41 +02:00
wiseoldman95
290bc2e377 Spaces in cPath 2015-05-08 17:08:15 +03:00
Woazboat
eb84ffe5a6 Added float comparison warning overrides to Vector3::hasNonZeroLength 2015-05-08 15:12:33 +02:00
Woazboat
ed404bc2f6 Ignoring Clang warnings for strict float comparison in Vector::Equals() 2015-05-08 15:12:33 +02:00
Woazboat
689fe6041c Changed Vector3 Equals function to avoid using memcmp 2015-05-08 15:12:33 +02:00
Woazboat
8a50918d2a Tracer::signum function now returns int
convert c style casts to c++ static casts

Changed fabs() to std::abs()
2015-05-08 15:12:32 +02:00
Woazboat
c74bfc35d6 Check for zero length vector in Trace
Added hasNonZeroLength member function to Vector3
2015-05-08 15:12:32 +02:00
Woazboat
0d003a2d2a Changed Tracer::m_NormalTable to static array
Was previously instantiated for every trace
2015-05-08 15:12:32 +02:00
Mattes D
fee690a3d1 Fixed inter-plugin calls.
When an inter-plugin call failed due to function not found, the server would maul the LuaState and "yield".
Fixes #1959.
2015-05-07 23:03:04 +02:00
worktycho
011126293b Merge pull request #1949 from SafwatHalaby/burn
AI - Better shade cover
2015-05-07 21:58:02 +01:00
Tri125
429e545167 Fixed #1893
Quartz ore now stack properly
2015-05-07 11:49:11 -04:00
Mattes D
4888f671d1 Merge pull request #1951 from mc-server/BroadcastRefactor
Added support for sending additional data in the ParticleEffect packet
2015-05-07 16:14:56 +02:00
Tri125
9f6192687f Big Magma Cube can now spawn
Following the same method as the Slime, Magma Cube can now spawn with the size of 1, 2 or 4.
2015-05-06 23:56:08 -04:00
Tri125
63af47832d Fixed the sound issue with the MagmaCube
-Name of the sound is correctly capitalized

-Get the appropriate sound depending on its size
2015-05-06 23:12:17 -04: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
wiseoldman95
40af96b100 AI - Safer WouldBurnAt() 2015-05-06 20:01:06 +03:00
wiseoldman95
753dfb950a AI - Better shade cover 2015-05-06 20:01:06 +03:00
worktycho
7771091099 Actually empty the open list 2015-05-06 17:26:59 +01:00
wiseoldman95
b8aa38b18d (duplicate) AI - Livestock escape fixed, water jumping fixed 2015-05-06 17:23:07 +03:00
wiseoldman95
c6dd455d72 PF - Swimming bugfix 2015-05-06 09:27:47 +03:00
wiseoldman95
020e928685 PF - Fixed mobs not reaching leaning player 2015-05-06 07:31:02 +03:00
worktycho
f71d693302 Merge pull request #1939 from SafwatHalaby/Polising
AI - More conservative use of ResetPathFinding, some polishing
2015-05-05 14:09:16 +01:00
wiseoldman95
304bc4eca4 AI - More conservative use of ResetPathFinding, fixed minor swimming / jumping bug 2015-05-05 12:51:58 +03:00
wiseoldman95
94f882b144 Chmod +x CheckBasicStyle.lua 2015-05-05 12:49:07 +03:00
Mattes D
9ba7823252 Merge pull request #1938 from jan64/master
Change visual protocol name to include MCServer
2015-05-04 23:28:49 +02:00
Alexander Harkness
adba982257 Merge pull request #1935 from mc-server/fixes
Entity improvements
2015-05-04 19:31:53 +01:00
jan64
b1efaa55cd Change visual protocol name to include MCServer 2015-05-04 17:52:46 +02:00
worktycho
6df0e877e8 Print Build info as part of the crash information 2015-05-04 09:07:03 +01:00
Tiger Wang
a509cf00ef Entity improvements
•Pathfinder improvements
•Fixes #1217
•Fixes #1933

Merge remote-tracking branch 'SafwatHalaby/water2' into fixes
2015-05-03 23:58:12 +01:00
Tiger Wang
335879e224 Merge pull request #1934 from SafwatHalaby/p_IsSolidChunks
PathFinder - Fixed nullptr chunk bug
2015-05-03 18:53:37 +01:00
wiseoldman95
33ffa420a6 PathFinder - Fixed nullptr chunk bug 2015-05-03 19:43:11 +03:00
Tiger Wang
f96f9dae66 Merge pull request #1930 from SafwatHalaby/AI_Jump
AI - Improved Mob Jumping
2015-05-03 13:23:04 +01:00
wiseoldman95
d68b75a679 AI - Improved Mob Jumping 2015-05-03 14:24:24 +03:00
Mattes D
d757d75b6c Merge pull request #1932 from SafwatHalaby/F_AssertFix
PathFinder - Fixed Howaner's bug
2015-05-03 11:51:09 +02:00
wiseoldman95
599ad97b65 PathFinder - Crash fix, chunks in parameters are now references 2015-05-03 10:49:06 +03:00
Mattes D
e6eeee84e0 Merge pull request #1880 from mc-server/submodules
Update submodules
2015-05-03 00:03:07 +02:00
Tiger Wang
9226bdbd4c Merge pull request #1925 from SafwatHalaby/PathFinder_Optimze
Pathfinder optimization
2015-05-02 16:50:42 +01:00
Tiger Wang
114962943b Merge pull request #1927 from SafwatHalaby/AI_BetterDayLightHandling
AI - Much better burning/daylight behavior
2015-05-02 16:50:08 +01:00
Tiger Wang
e4eb039704 Merge pull request #1919 from mathias-github/patch-1
Added Guardian and Rabbit to DefaultMonsters in Overworld
2015-05-02 16:10:51 +01:00
Tiger Wang
2919d08883 Update submodules 2015-05-02 15:57:49 +01:00
wiseoldman95
3586f25853 AI - Better daylight handling 2015-05-02 14:32:33 +03:00
wiseoldman95
16b6fc9b5d PathFinding - Chunk querying optimization and improve cPath::IsSolid 2015-05-02 14:16:16 +03:00
Mattes D
a762e8a54a CheckBasicStyle: Can check individual files or git commits. 2015-05-02 13:02:18 +02:00
wiseoldman95
1b0e21e0b2 A* Pathfinding and better monster AI 2015-05-01 13:18:47 +03:00
Mattes D
a3c4b7580b Added cBlockArea:CountNonAirBlocks API function. 2015-04-30 23:16:33 +02:00
Mattes D
8d4a87d2c4 Fixed bindings for cFile:ReadWholeFile().
Fixes #1914
2015-04-30 11:44:42 +02:00
Mattes D
4bf3b874e3 Merge pull request #1922 from mc-server/BlockAreaExt
cBlockArea extensions
2015-04-30 10:39:15 +02:00
Mathias
17343d8215 Added Guardian and Rabbit to DefaultMonsters in Overworld 2015-04-29 18:07:26 +03:00
Mattes D
ca90f6d280 Added cBlockArea::msSimpleCompare merge strategy. 2015-04-29 15:45:48 +02:00
Mattes D
fc95501f68 Added cBlockArea:GetNonAirCropRelCoords() API function.
Fixes #1915.
2015-04-29 15:14:22 +02:00
jammet
6e3c584f07 Clay blocks are handled with the OreHandler 2015-04-29 10:14:34 +02:00
wiseoldman95
231ba3af53 Updated MC versions in ProtocolRecognizer.h 2015-04-28 09:16:09 +03:00
worktycho
facb6e7416 Merge pull request #1909 from Woazboat/CodeCleanup
cSetChunkData constructor explicitly requires std::move()
2015-04-27 21:11:56 +01:00
Woazboat
e240cab523 Removed redundant temp iterator. std::list.erase already returns
iterator to next valid list element
2015-04-27 21:54:36 +02:00
Woazboat
6caf08da99 cSetChunkData constructor explicitly requires std::move() instead of
unsafely stealing data
2015-04-27 21:18:56 +02:00
Tiger Wang
b10336ad64 Fix explosions trying to write to unread blockarea 2015-04-26 19:17:08 +01:00
Mattes D
0de768b56d Merge pull request #1897 from mc-server/Restrictions
Restrictions
2015-04-25 22:32:13 +02:00
Mattes D
b5998873e4 cPlayer now checks restrictions.
Fixes #1331.
2015-04-25 21:05:43 +02:00
Mattes D
9c5797f27d Added player restrictions to the DB and API. 2015-04-25 21:05:35 +02:00
Mattes D
80baa2b056 Merge pull request #1896 from mc-server/FindAndDoWithPlayerRace
Eliminate race condition in cRoot::FindAndDoWithPlayer
2015-04-25 18:58:11 +02:00
Mattes D
b7d1d701b9 Plugin removes its command registrations and webtabs when unloaded.
Fixes #1890.
2015-04-25 18:11:14 +02:00
worktycho
20593dcb35 Eliminate race condition in cRoot::FindAndDoWithPlayer
Avoid a race condition where a player gets deleted during the FindAndDoWithPlayer callback by moving the callback into DoWithPlayer.
2015-04-24 12:45:44 +01:00
Mattes D
a89d5f53fd Refactored ManualBindings' callbacks using templates.
This is a bit easier to read, has better error reporting and fixes a few subtle bugs.
Fixes #1889.
2015-04-23 22:20:31 +02:00
jammet
e42beb51ab Digging up a clay block spawns 4 clay items.
Fixes #1884.
Closes #1891.
2015-04-23 21:39:10 +02:00
Mattes D
a41f21f76f Merge pull request #1892 from mc-server/DoWithPlugin
Implemented cPluginManager:DoWithPlugin(), fixed ForEachPlugin().
2015-04-23 21:36:17 +02:00
Mattes D
08624348f4 Implemented cPluginManager:DoWithPlugin(), fixed ForEachPlugin().
Both functions are exported as static.
2015-04-23 19:41:01 +02:00
jammet
6f0eafdc3a Nether Quartz is handled in the Ore handler.
Fixes #1885, Closes #1888
2015-04-23 15:21:14 +02:00
Mattes D
e51bd6bcd8 Merge pull request #1851 from wraith11/DoorFix
Fix door placing in connection with slabs
2015-04-23 00:55:51 +02:00
Mattes D
5f0a78200b Merge pull request #1852 from wraith11/SlabPlacing
Fix slab placing
2015-04-23 00:54:59 +02:00
wraith11
85c37dd3a0 Fix slab placing 2015-04-22 23:01:21 +02:00
Mattes D
e08e932e7a Narrowed WindowID to use only 7 bits.
Ref.: http://forum.mc-server.org/showthread.php?tid=1876
2015-04-21 23:29:50 +02:00
Mattes D
18690a2633 Hotfixed some chunk presence issues when generating. 2015-04-21 23:12:47 +02:00
Mattes D
0ff7514351 Merge pull request #1879 from mc-server/DynamicThreshold
Changed Nether composition to change the threshold from a cubic noise
2015-04-21 23:09:27 +02:00
wraith11
794013315b Fix door placing in connection with slabs
Except top-half slabs as transparent blocks for doors.
2015-04-21 20:47:02 +02:00
STRWarrior
c5189aaf9c Changed default MaxThreshold value
There is now really a difference between open and dense parts
2015-04-21 16:30:18 +02:00
STRWarrior
cc67a8bde9 Calculate threshold for each column in a chunk instead for the whole chunk 2015-04-21 16:01:27 +02:00
Mattes D
7ef9dea015 Network: fixed excessive debug logging. 2015-04-21 12:11:44 +02:00
Mattes D
de27f66b59 Added URL member to the HTTPRequest API class. 2015-04-21 10:54:43 +02:00
STRWarrior
3b74107bf3 Changed Nether composition to change the threshold from a cubic noise 2015-04-20 18:03:25 +02:00
Mattes D
b97f41b8c6 ItemHandler type fixes. 2015-04-20 09:17:26 +02:00
Mattes D
c0bd482448 Protocol 1.8: Limit the amount of displayed data on NBT parse failure. 2015-04-20 08:35:32 +02:00
Mattes D
c9fbcea66d ItemHandler: Using automatic array bounds. 2015-04-20 08:34:44 +02:00
Mattes D
c5ad058424 HangingEntity: Fixed a needless clang warning. 2015-04-19 21:34:56 +02:00
STRWarrior
423bbbdbe1 Fixed typo in NetherForts initialization
The S in NetherForts was missing
2015-04-19 20:53:25 +02:00
NiLSPACE
3056e6d324 Merge pull request #1877 from mc-server/GlowStone
Added GlowStone finisher
2015-04-19 20:23:15 +02:00
STRWarrior
f17f0fa3bd GlowStone: Changed order of initialization of member variables 2015-04-19 20:08:51 +02:00
STRWarrior
f1558c6015 Fixed style 2015-04-19 19:59:27 +02:00
Mattes D
ba6f5aea4c Merge pull request #1875 from mc-server/PluginFolders
Split the plugin names and plugin folders to avoid confusing them.
2015-04-19 19:53:14 +02:00
STRWarrior
e7542f676d Added GlowStone finisher 2015-04-19 19:45:18 +02:00
Mattes D
fd497b8269 ClientHandle: Fixed re-sending refused right-clicks.
The coords weren't checked against Y boundary and -1 coords weren't sent.
This fixes mc-server/Gallery#45.
2015-04-19 17:33:58 +02:00
Mattes D
d40078d163 HTTP: Error message is sent as the payload as well.
This shows the error message in the browsers. Before, the browsers would display just a blank page.
2015-04-19 17:32:44 +02:00
Mattes D
be40ea323a Refresh plugin list before trying to load. 2015-04-19 17:25:48 +02:00
Mattes D
4a946aa8c4 Added cPluginManager:IsPluginLoaded() API, better load error msgs. 2015-04-19 17:20:15 +02:00
Mattes D
3b49a1d250 Merge pull request #1864 from mc-server/StrictRecipeMatching
Recipes match zero DamageValue strictly.
2015-04-19 14:41:35 +02:00
Mattes D
288d2280fa Refactored cWebPlugin for C++11 style and proper WebTab clearing. 2015-04-19 14:35:04 +02:00
Mattes D
a9b5a6c3a6 Split the plugin names and plugin folders to avoid confusing them.
Ref.: http://forum.mc-server.org/showthread.php?tid=1877
2015-04-19 10:57:41 +02:00
mathias-gh
9cbd7f64c1 Update IronGolem.cpp 2015-04-17 21:18:34 +03:00
mathias-gh
f370443b9b Added MobTypeName for Giant 2015-04-17 19:33:34 +03:00
Tiger Wang
15afff1eab Fixed arm swing animation
* Fixes #1861
2015-04-17 15:33:40 +01:00
Mattes D
0b3fd73f90 Recipes match zero DamageValue strictly.
To match any DamageValue for the ingredient, an explicit "-1" as the DamageValue must be specified.
Fixes #1859.
2015-04-16 21:33:42 +02:00
Mattes D
ffe7dae4fc Fixed PolishedGranite et al crafting recipes.
Fixes #1774. Ref.: #1859
2015-04-16 20:59:57 +02:00
Mattes D
1d8a22cb7b Merge pull request #1858 from mc-server/BucketPluginCalls
Bucket plugin calls
2015-04-15 11:07:03 +02:00
Mattes D
54289aeccb Merge pull request #1844 from DevToaster/master
Modified physics for more vanilla-like behavior
2015-04-14 22:31:09 +02:00
Mattes D
d421befece Scooping up fluid calls the player placement hooks.
Ref.: #1857.
2015-04-14 10:55:48 +02:00
Mattes D
de8e5ea8e4 Placing a fluid from bucket calls plugin hooks.
Ref.: #1857.
2015-04-14 10:49:01 +02:00
Mattes D
29af16143e Removed HOOK_MAX and HOOK_NUM_HOOKS from Lua API. 2015-04-13 12:33:25 +02:00
Scott Moore
8c144207dc Implement backend for /title command 2015-04-13 16:22:51 +10:00
Mattes D
9367d44cb4 Merge pull request #1854 from mc-server/FileOps
File ops
2015-04-12 10:54:05 +02:00
Mattes D
79e8f8fb20 cFile:ChangeFileExt now accepts extensions with leading dot, too. 2015-04-11 17:42:32 +02:00
Mattes D
c4842cb9aa Added more cFile API functions.
GetLastModificationTime, GetPathSeparator() and GetExecutableExt()
2015-04-11 10:06:08 +02:00
Mattes D
38d666432d Fixed plugin hook calls when unloading plugins.
If a plugin installs any hooks in its Initialize method and then causes the Lua runtime to abort, the server asserted because the hooks were called while the plugin was being unloaded.
2015-04-10 22:31:23 +02:00
Mattes D
65a1158e40 Added proper implementation of cFile::ChangeFileExt(). 2015-04-10 21:40:45 +02:00
STRWarrior
13b96a40ea Added extra divide operator to Vector3.
The multiply operator had one for both a different vector and a number, but the divide operator didn't.
2015-04-07 13:25:55 +02:00
Mattes D
4836d07bfa Fixed MSVC warnings, improved comments. 2015-04-06 22:01:25 +02:00
Mattes D
6952f2295a Added cFile:ChangeFileExt() function. 2015-04-06 22:00:54 +02:00
Mattes D
31953b19b8 Fixed crash on exit introduced with Windows Service capability.
Ref.: #1845
2015-04-05 17:07:29 +02:00
Mattes D
e42e46d5f9 Merge pull request #1846 from mc-server/WorldChanging
Fixed player switching world bug
2015-04-04 11:32:17 +02:00
STRWarrior
399392195f Fixed players not appearing/disappearing when traveling to a new world. 2015-04-03 18:40:20 +02:00
STRWarrior
e6819c4c65 Fixed the nether and end getting snow if they were generated in the overworld. 2015-04-03 16:32:31 +02:00
Mattes D
afdd751fe3 Merge pull request #1799 from SnappingTurtles/BlockButton
Buttons can be placed on the top and on the bottom face of a block
2015-04-03 15:41:39 +02:00
Anthony Birkett
51891b766c Working as a Windows service. Starts and stops correctly.
Added "/service" switch, to prompt the binary to attempt starting as a service.
Added service* methods, to control service startup.
Split up main() into universalMain(), which contains the startup code for both service and normal start.
Added cRoot::m_RunningAsService bool,
Added cRoot::SetStopping(bool) to allow a stop request to be sent by the service controller.
Added cBlockIDMap::init() to avoid loading items.ini before the working directory has been set.
2015-04-01 00:03:37 +01:00
DevToaster
a9583149b4 Changed air drag for pickups 2015-03-31 11:40:31 -04:00
DevToaster
45c84ea933 Changed air drag units to 'interpolated ticks' per second 2015-03-31 11:03:35 -04:00
DevToaster
d315534b76 Adjusted projectile physics 2015-03-30 20:07:19 -04:00
DevToaster
c743c7fd0c Modified physics for more vanilla-like behavior 2015-03-30 19:42:32 -04:00
Mattes D
53f5cc209f Fixed placing bottom half-slabs by clicking a top half-slab.
Ref.: #1837
2015-03-28 10:44:42 +01:00
Alexandre Guertin
97daf810ff Removed 0x6, 0x7 from BlockButton. 2015-03-25 16:12:02 -04:00
Mattes D
e5a7a730ed Merge pull request #1826 from mc-server/UnifyPacketizer
Unify packetizer
2015-03-24 13:09:41 +01:00
Mattes D
f1ef7f57ff Merge pull request #1775 from tommysanterre/terrainheightfix
Correct all world height validations.
2015-03-23 12:25:22 +01:00
Mattes D
b913c5da69 Added VarInt64, normalized cPacketizer datatype names. 2015-03-22 23:09:23 +01:00
Mattes D
c626848393 Unified cPacketizer across all protocols. 2015-03-22 19:46:08 +01:00
Mattes D
8df9f1685a ProtoProxy: Fixed connection and logging. 2015-03-22 15:00:51 +01:00
worktycho
d02c908670 Merge pull request #1786 from mc-server/pipelineSyntax
Added pipelining syntax for generators
2015-03-21 21:08:33 +00:00
worktycho
7089b68030 Style fixes 2015-03-21 19:45:01 +00:00
worktycho
d966200a6c Fixed alignment 2015-03-21 19:35:25 +00:00
Mattes D
c3c29577a5 Fixed signedness warnings in Protocol. 2015-03-21 16:11:57 +01:00
Mattes D
b698286e86 Creeper: Fixed skeleton check. 2015-03-21 15:52:49 +01:00
Mattes D
3923e3e37a Fixed signedness issues in protocols. 2015-03-21 15:40:56 +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
7e7527cc43 Fixed trailing whitespace. 2015-03-21 14:07:16 +01:00
Mattes D
b1d4b3bb96 Unified cByteBuffer types.
cByteBuffer now reads and writes any of the [U]Int<N> types.
2015-03-21 13:00:20 +01:00
Tiger Wang
60a52288d8 Improved arrow in-flight and block-hit appearance
* Fixes #1495
2015-03-20 22:32:32 +00:00
Mattes D
0f45d1fbe2 cPluginLua:cResettable no longer shares CS with plugin.
This fixes locking the resettable while the plugin is already gone. Hopefully no deadlocks.
2015-03-20 16:51:49 +01:00
Mattes D
8a43da0723 Merge pull request #1822 from mc-server/ResettableLuaCallback
Added cPluginLua::cResettable interface, used for scheduled tasks.
2015-03-20 16:11:50 +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
Mattes D
967ece1684 Merge pull request #1821 from bibo38/bugfix1765
Removed Metavalue from Piston drops.
2015-03-20 12:13:21 +01:00
bibo38
3058c4c010 Removed Metavalue from Piston drops. Bugfix #1765 2015-03-20 11:14:42 +01:00
Tommy Santerre
3f6d823aa4 Correct world height validations.
Unify the way we test block above the current one (Height - 1 instead of a_RelY + 1).
Allow generation of world of flat height = 255
2015-03-19 20:32:17 -04:00
Mattes D
2d1d4ae3e3 Removed unwanted base classes from Lua API. 2015-03-19 21:26:38 +01:00
Mattes D
93031dffd8 AllToLua: Fixed cMonster inheritance. 2015-03-19 21:06:28 +01:00
Mattes D
2fed8c3227 Improved DoWithID bindings. 2015-03-19 16:24:32 +01:00
bibo38
54d97f8c17 Removed wrong else clause, which caused that the following if-Statement got only executed in rare cases. This has blocked the creation of new Fluid-Sources. Bugfix #1783 2015-03-19 13:23:03 +01:00
Mattes D
f3046417ec Fixed a clang warning, improved comments. 2015-03-19 12:46:37 +01:00
Mattes D
9eb9541060 AllToLua: Removed an unneeded class declaration.
It's perfectly possible to declare a class in ManualBindings without the need for declaration in AllToLua.pkg.
2015-03-19 12:34:16 +01:00
Mattes D
09da6e7a6e AllToLua: Fixed the parse order for bindings generation.
Fixes #1789.
2015-03-19 12:19:04 +01:00
Mattes D
5f660f7677 Added cNetwork initialization to program start.
Otherwise the server could crash because MSVC doesn't implement magic statics yet.
2015-03-18 22:07:57 +01:00
Mattes D
49e59ee06b World:DoWithEntityByID() checks the entities-to-add as well.
This allows plugins to create entities and immediately act on them using that call. This will most likely need to be added to most of the DoWith<> and ForEach<> calls.
2015-03-18 15:35:19 +01:00
Mattes D
0aff42a4bc Network: Close the UDP endpoint in destructor. 2015-03-18 13:50:43 +01:00