1
0
Commit Graph

1007 Commits

Author SHA1 Message Date
Tiger Wang
14b5054c95 Fixed a boat ASSERT 2014-02-08 23:02:50 +00:00
STRWarrior
645c096e2b The console reload command also reloads the groups. 2014-02-09 00:02:16 +01:00
madmaxoft
cf48968835 Moved a forgotten comment back to its place. 2014-02-08 22:35:45 +01:00
madmaxoft
df0ecc6c07 Fixed lighting thread queueing. 2014-02-08 22:33:42 +01:00
madmaxoft
7432d2f74d Fixed ChunkStay initialization. 2014-02-08 22:23:38 +01:00
madmaxoft
a4bf44858d Fixed gcc compilation. 2014-02-08 22:01:04 +01:00
madmaxoft
ea71bfa9b6 Initial ChunkStay code. 2014-02-08 21:55:21 +01:00
Mattes D
169b918222 Merge pull request #653 from mc-server/RedstoneSimulator
Improvements for the redstone simulator.
2014-02-08 14:54:00 +01:00
madmaxoft
cfd6875c86 Fixed cWorld:TryGetHeight() API. 2014-02-08 13:35:08 +01:00
STRWarrior
53475e36d5 Fixed comment. 2014-02-08 11:20:00 +01:00
STRWarrior
3a897844a0 Renamed cRedstoneManager to cRedstoneSimulator and renamed cRedstoneSimulator to cIncrementalRedstoneSimulator (Might change later). 2014-02-07 22:59:08 +01:00
STRWarrior
09a23fa114 Fixed some end of lines 2014-02-07 22:25:15 +01:00
STRWarrior
176664810b Implemented an easy way of adding new redstone simulators.
Also added a "noop" redstone simulator that does the same as the fluid version.
2014-02-07 22:13:55 +01:00
Tiger Wang
fadf3c037b Moved Gamemode setting into General root tag 2014-02-07 20:11:56 +00:00
Tiger Wang
0f36d1c122 Added sender name to PM if prefixes disabled
* Also moved the PVP setting into Mechanics
2014-02-07 20:10:12 +00:00
Tiger Wang
88a64ec40d Improved chat messaging functions
* Moved string manipulation into cClientHandle and therefore...
+ Added configuration option for prefixes.
* Cleaned up code.
* Updated documentation for API.
2014-02-07 18:58:52 +00:00
madmaxoft
e165da946e WebAdmin is stopped properly on server shutdown / restart.
Fixes #272.
2014-02-07 12:26:41 +01:00
madmaxoft
916020d6c2 Fixed wiki link in auto-generated settings.ini. 2014-02-07 12:07:22 +01:00
Tiger Wang
aa8b46e947 Server internally uses new functions 2014-02-05 23:24:16 +00:00
Tiger Wang
3450f0ca42 Added more chat functions 2014-02-05 23:24:02 +00:00
Mattes D
24dfe7f9cc Merge pull request #648 from worktycho/runMCServer
Added BoundingBox Test
2014-02-05 21:26:12 +01:00
worktycho
374fecf61f Change Output to stderr 2014-02-05 20:13:37 +00:00
Mattes D
cd634ea138 Merge pull request #649 from mc-server/GroupsPermissions
Removed deprecated HasCommand function
2014-02-05 21:07:10 +01:00
STRWarrior
89ec774fd6 Removed deprecated HasCommand function 2014-02-05 20:20:11 +01:00
Tycho
9015e56c60 Merge branch 'master' into runMCServer 2014-02-05 11:08:10 -08:00
Tycho
aeb877f76a Modified automatic test for boundingBox 2014-02-05 11:06:57 -08:00
Mattes D
694fa5d541 Merge pull request #645 from mc-server/GroupsPermissions
Improvements to the GroupManager
2014-02-05 19:58:02 +01:00
Tycho
670213b48d Simplified shutdown 2014-02-05 10:39:33 -08:00
Alexander Harkness
b9aa0420a3 Merge pull request #646 from worktycho/warningfixes
Fixed most of the reordering warnings
2014-02-05 18:24:08 +00:00
Tycho
f25597540d Added support to start up MCServer and then immediatly sut it down in travis 2014-02-05 10:10:45 -08:00
Tycho
8ba6f73169 Fixed most of the reordering warnings 2014-02-05 09:43:49 -08:00
STRWarrior
d6142b53f3 Forgot extra lines. 2014-02-05 18:14:51 +01:00
STRWarrior
7c750914f0 Improvements:
Adds a function in cRoot that allows you to reload all the groups permissions.
Note: Players don't automatically load their new permissions.
You can use cPlayer::LoadPermissionsFromDisk for that.
2014-02-05 18:10:08 +01:00
madmaxoft
9e98c9691d Improved the signedness conversion. 2014-02-05 13:54:47 +01:00
Tiger Wang
99fdadd58e Reduced max explosions per tick 2014-02-05 00:45:08 +00:00
Tiger Wang
94c343fe07 Fixed explosions bug
* Fixed bug where explosions would sometimes never be sent
2014-02-04 23:40:58 +00:00
Tiger Wang
ea2ce1595f Fixed annoying creative on fire bug 2014-02-04 23:27:13 +00:00
madmaxoft
e5dce265ae Added cPluginManager:LogStackTrace() to the Lua API.
Fixes #637.
2014-02-05 00:16:33 +01:00
Tiger Wang
630507fd5b Fixed a bunch of MSVS warnings
* Possibly also fixed some bugs with pathfinding and TNT, though
unlikely
2014-02-04 23:07:22 +00:00
Tiger Wang
9eeeb91fa6 Added more SendMessageXXX() functions 2014-02-04 22:39:57 +00:00
madmaxoft
cc032995bd Crypto: Removed unused member, fixed gcc warning. 2014-02-04 23:25:06 +01:00
madmaxoft
a96ea33b64 Added dtExplosion to damage<->string functions. 2014-02-04 23:09:07 +01:00
madmaxoft
91a8db0d7e Protocol 1.7: Fixed a signed / unsigned comparison warning. 2014-02-04 22:41:54 +01:00
madmaxoft
82173db9bf Fixed a gcc warning in ManualBindings.
Constructor member order...
2014-02-04 22:26:35 +01:00
madmaxoft
010e64be11 Removed a useless check in cLuaState. 2014-02-04 22:24:03 +01:00
madmaxoft
5cdbb6683f Fixed a warning in cItem in gcc.
Constructor member order...
2014-02-04 22:18:59 +01:00
madmaxoft
835a59b8fc Protocol 1.7 uses char for blockface.
That should fix #644 on RasPi.
2014-02-04 22:15:01 +01:00
Mattes D
dad49c6fdd Merge pull request #644 from worktycho/warningfixes
Improved Type safety of eBlockFace
2014-02-04 13:10:44 -08:00
Tycho
1f26c9f5ab Fix gcc not having operator ++ on enums 2014-02-04 11:26:39 -08:00
Tycho
8464f689ea Improved Type safety of eBlockFace
May Fix #640
2014-02-04 10:59:05 -08:00
madmaxoft
634331fd3b Fixed chest placement.
Fixes #624.
2014-02-04 18:38:10 +01:00
Mattes D
0ceb0ef607 Merge pull request #635 from tonibm19/master
Exported Item:IsEnchantable and Monster:MoveToPosition to Lua API
2014-02-04 09:23:03 -08:00
tonibm19
a845b9abbb Blank lines and indentation.
Also removed GetClosestPlayer documentation
2014-02-04 17:29:36 +01:00
madmaxoft
3dc1452790 Fixed calling plugins with userdata params. 2014-02-04 14:26:36 +01:00
madmaxoft
1dbfd7eb76 Removed a leftover debug message. 2014-02-04 11:37:34 +01:00
madmaxoft
69c85e5169 Fixed error handling in cPluginManager:CallPlugin() API.
Fixed: When the called function malfunctioned, the entire plugin's call was aborted.
2014-02-04 10:29:10 +01:00
madmaxoft
aa19f4fd04 Improved error resistance in cPluginManager:CallPlugin().
Fixed: If the call failed, all the next plugin calls would fail as well.
2014-02-04 09:18:32 +01:00
Tiger Wang
d1b5f0859a Greatly improved TNT propulsion chances 2014-02-03 22:55:15 +00:00
Tiger Wang
01c723e89e Pickup constructor no longer exported
It didn't do anything without Initialize() exported, anyway, pickups are
spawned with cWorld.
2014-02-03 22:51:26 +00:00
Tiger Wang
3583a58cf7 Added SendMessageXXX() to cPlayer
As requested by @bearbin, one no longer needs to download a file that
links to Core. The server does it! Hopefully this encourages standards
compliance.
2014-02-03 22:46:56 +00:00
Mattes D
41b8315f53 Merge pull request #636 from worktycho/warningfixes
Increased Type safety of Biomes
2014-02-03 14:42:31 -08:00
Tiger Wang
d82f3102e5 Partial fix for #130 2014-02-03 22:26:16 +00:00
Tiger Wang
fad90081d2 Fixed #491 2014-02-03 22:25:16 +00:00
Tiger Wang
6de8c09fe0 Fixed a crash bug 2014-02-03 22:24:22 +00:00
Mattes D
351e925e3d Merge pull request #633 from mc-server/More_Sideways_Blocks
More sideways blocks.
2014-02-03 14:01:22 -08:00
STRWarrior
70e48960ac Named the different quartz block. 2014-02-03 22:30:32 +01:00
Tiger Wang
a3759c1462 Merge remote-tracking branch 'origin/master' into playerimprovements 2014-02-03 21:25:42 +00:00
Tiger Wang
3fc848c95a Fixed #626
* Fixed consumption of carrots and potatoes
2014-02-03 21:16:26 +00:00
Tiger Wang
6bbba2644d Fixed issues with farmland
* Fixed farmland reversion checks not taking into account carrots and
potatoes
* Fixed #623
2014-02-03 21:14:52 +00:00
Tiger Wang
b5e898a608 Server now handles join messages also
* Revised as well hook documentation
2014-02-03 21:12:44 +00:00
Tycho
4b19247305 Fogot to save Biogen 2014-02-03 13:07:38 -08:00
Tycho
d9fb83300c Fixed Compile errors
c++11 introduces scoped enums, so the code didn't fail in clang
2014-02-03 13:01:12 -08:00
Tycho
f8881622a4 Removed unused lookups 2014-02-03 12:31:18 -08:00
Tycho
80807eec2c Increased Type safety of Biomes
Changed a number of funcictions from using integers to store biomes to using EMCSBiome
Note that switching from an int to an Enum is a non-breaking chang to the lua bindings
2014-02-03 12:26:17 -08:00
tonibm19
df8b589b31 Not exporting FindClosestPlayer 2014-02-03 21:06:43 +01:00
tonibm19
defb001ad7 Fixed compilation 2014-02-03 21:05:10 +01:00
tonibm19
c2e7dd34d9 Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua API 2014-02-03 20:52:11 +01:00
STRWarrior
347488a9a2 Fixed some issues.
Meta wasn't set if the block wasn't a pillar.
Fixed typo.
2014-02-03 20:34:05 +01:00
STRWarrior
0c29c52ff3 Renamed cBlockQuartsHandler to cBlockQuartzHandler. Fixed not being able to place normal quartz blocks. 2014-02-03 20:22:45 +01:00
STRWarrior
5ba46ebc21 This renames the cBlockWoodHandler to cBlockSidewaysHandler, and implements a new cBlockQuartzHandler to handle the quartz pillars. 2014-02-03 20:08:38 +01:00
Mattes D
2450d0467f Merge pull request #623 from mc-server/tnt
TNT improvements
2014-02-03 10:55:23 -08:00
madmaxoft
c9916cd8c2 Fixed socket leaking. 2014-02-03 17:07:46 +01:00
Tiger Wang
e3b9cdebc9 Inversed condition 2014-02-03 14:01:47 +00:00
madmaxoft
0b384198e5 SocketThreads: Fixed sending to closed socket. 2014-02-03 10:39:10 +01:00
madmaxoft
c2c1639af8 Groups.ini can contain spaces around commas in values.
This includes Permissions, Inherits and Commands.
Also fixed an unlikely but possible crash with group colors.
2014-02-03 10:39:09 +01:00
Mattes D
b090547c17 Merge pull request #602 from mc-server/improvementsandfixes
Redstone crash fix and current console line replace function
2014-02-02 22:02:25 -08:00
Tiger Wang
c1c7936c68 Fixed multiple invalid permission nodes
New players can build as default now
2014-02-02 22:55:41 +00:00
Tiger Wang
2d0b31e7b6 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-02-02 22:09:03 +00:00
Tiger Wang
ac03c51997 Fixed #624 2014-02-02 22:08:57 +00:00
Tiger Wang
0f67f80c6e Added IsBlockWaterOrIce() 2014-02-02 21:48:21 +00:00
Tiger Wang
ba398c06d7 Uncommented pickup spawner code 2014-02-02 21:24:06 +00:00
Tiger Wang
d9a9052de7 Revert "Added LOGREPLACELINE for line replacement"
This reverts commit 7d03876a3e.
2014-02-02 20:10:31 +00:00
Tiger Wang
6ef5c057aa Revert "Improved code"
This reverts commit d8aa0b0ec7.
2014-02-02 20:10:23 +00:00
Tiger Wang
f4c25ac445 Revert "Added a comment"
This reverts commit 7ae5631d89.
2014-02-02 20:10:13 +00:00
Tiger Wang
ecbb9134a5 Revert "Properly initialised variables"
This reverts commit 02e7527893.
2014-02-02 20:10:02 +00:00
Tiger Wang
dd3cc733ae Revert "Fixed issues with insufficient console space"
This reverts commit 6b18add09b.
2014-02-02 20:09:56 +00:00
Tiger Wang
e4b666989d Revert "A newline issue is resolved"
This reverts commit 397208145e.
2014-02-02 20:09:47 +00:00
Tiger Wang
070962fb8a Revert "Fixed Linux compile"
This reverts commit 5becfe850a.
2014-02-02 20:09:40 +00:00
Tiger Wang
a0242afec2 Revert "Another Linux fix"
This reverts commit 6f660b379e.
2014-02-02 20:09:35 +00:00
Tiger Wang
5bf060f06c Revert "Again improved LogReplaceLine"
This reverts commit dd325d742d.
2014-02-02 20:09:15 +00:00
Tiger Wang
e56d41175b TNT improvements
+ Added entity damage
+ Added entity propulsion
* Fixed #67 and fixed #230
2014-02-02 19:16:38 +00:00
Tiger Wang
55cfb232db Possibly fixed #618 2014-02-02 19:10:22 +00:00
Tycho
1e4e6c4619 Merge branch 'master' into registerfix 2014-02-02 09:11:53 -08:00
madmaxoft
c3d4cc4f4f Fixed dark oak and acacia placement.
Fixes #621.
2014-02-02 17:52:05 +01:00
Tycho
42497847ac Added missing files 2014-02-02 06:59:36 -08:00
Tycho
0b0aa5554f Merge branch 'master' into GeneratingBenchmark2
Conflicts:
	src/Blocks/BlockTorch.h
2014-02-02 06:56:07 -08:00
Tycho
b82fc394dd Changed Signiture of OnUpdate 2014-02-02 06:49:37 -08:00
Tiger Wang
b89419f603 Creative players take Plugin damage 2014-02-02 12:47:17 +00:00
Tiger Wang
275035eb70 Fixed #620 2014-02-02 12:43:57 +00:00
Kirill Kirilenko
a134fd45cf Added saving of angry flag. 2014-02-02 14:28:42 +04:00
Kirill Kirilenko
a1c36c18e0 Fixed sitting tag. 2014-02-02 13:56:55 +04:00
Tiger Wang
dd325d742d Again improved LogReplaceLine
* Fixed issues on Linux with cursor positioning
* Made preprocessor blocks more readable
* Improved reliability of line clearing on Windows
- Removed an *unneeded* variable
2014-02-01 21:44:23 +00:00
Tiger Wang
e26dc5cc0a Added checks for ice into IsBlockWater()
* This fixes players spawning in vast oceans of ice, as opposed to the
previous water
2014-02-01 21:40:50 +00:00
Tiger Wang
b0784d1931 Split cCoord template into one and two data types 2014-02-01 21:40:02 +00:00
Kirill Kirilenko
2a52b390c0 Monster's nominal speed was increased. 2014-02-01 20:38:53 +04:00
Tycho
6e39ed3868 Changed Signiture of OnDigging 2014-02-01 08:35:48 -08:00
Kirill Kirilenko
0d33f2d11d Fixed teleport to air, if owner is flying. 2014-02-01 20:22:12 +04:00
Kirill Kirilenko
0259aed8be Added saving of collar's color. 2014-02-01 20:16:42 +04:00
Tycho
cf3b4ec226 Changed Signiture of OnDestroyedByPlayer 2014-02-01 06:01:13 -08:00
Tycho
4b5bd4dedf Removed register keyword from Messinne Twister
Removed register as it is meaningless in c++ and causes a depreciated warning in clang 3.4 in c++ mode for va_copy
2014-02-01 05:14:31 -08:00
Mattes D
33759197e9 Merge pull request #585 from daniel0916/hooks
Added "player destroying" and "player destroyed" hooks
2014-02-01 05:08:08 -08:00
Tycho
c6304b2b4f Changed pointers to references 2014-02-01 05:06:32 -08:00
daniel0916
dbbd47b96d Removed "player destroying" hook 2014-02-01 13:27:44 +01:00
Tiger Wang
6f660b379e Another Linux fix 2014-02-01 01:54:26 +00:00
Tiger Wang
5becfe850a Fixed Linux compile 2014-02-01 01:47:21 +00:00
Tycho
fec17409d2 Merge branch 'master' into GeneratingBenchmark2
Conflicts:
	src/World.h
2014-01-31 15:31:05 -08:00
Tiger Wang
397208145e A newline issue is resolved 2014-01-31 23:25:15 +00:00
Tycho
25ec7750aa Changed signitures of Several BLockHandler Methods
Changed the signitures of the following to use interfaces:
GetPlacementBlockTypeMeta
OnPlaced
OnPlacedByPlayer
OnDestroyed
OnNeighbourChanged
NeighbourChanged
OnUse
CanBeAt
Check
2014-01-31 15:17:41 -08:00
Tiger Wang
6b18add09b Fixed issues with insufficient console space 2014-01-31 23:02:26 +00:00
Tiger Wang
02e7527893 Properly initialised variables 2014-01-31 20:50:29 +00:00
Kirill Kirilenko
8180b643ff Added reading saved state of the wolf (sitting or standing). 2014-01-31 21:34:00 +04:00
Mattes D
617c5b1fff Merge pull request #607 from mc-server/Wolf_Owner_Saving
Wolf: Their owner now gets saved.
2014-01-31 07:32:38 -08:00
STRWarrior
19e5122b77 Inversed condition. 2014-01-31 16:31:55 +01:00
STRWarrior
c7e4ade7c3 Wolf: If Owner tag is missing a normal ownerless wolf will spawn. 2014-01-31 16:27:21 +01:00
madmaxoft
882d108622 Fixed cLineBlockTracer:Trace() signature. 2014-01-31 16:01:16 +01:00
madmaxoft
5092ae5266 Added cPluginManager:BindCommand() form to the API.
That's the canonical way to call static functions.
2014-01-31 16:01:15 +01:00
madmaxoft
66427d754b Added cChunkDest::UpdateHeightmap()
This function is necessary for plugins manipulating the generated chunks, they need to update the heightmap before it is passed back to the generator.
2014-01-31 16:01:15 +01:00
Tiger Wang
7ae5631d89 Added a comment 2014-01-31 00:05:23 +00:00
Tiger Wang
d8aa0b0ec7 Improved code
* Fixed some issues
* Fixed standard violation
2014-01-31 00:04:57 +00:00
STRWarrior
550a09020d Fixed bad variable. 2014-01-30 21:49:39 +01:00
STRWarrior
1a361be44f Check if the tag is found. 2014-01-30 21:46:45 +01:00
STRWarrior
419778a306 Fixes #606 2014-01-30 21:39:31 +01:00
tonibm19
16a939a757 Attempt at implementing #563
Not tested (I don't have RasPi)
2014-01-30 18:02:37 +01:00
madmaxoft
b61a74d6a2 Lua: Fixed an error in table-functions callbacks. 2014-01-29 22:56:38 +01:00
Tiger Wang
7d03876a3e Added LOGREPLACELINE for line replacement 2014-01-29 19:22:03 +00:00
Tiger Wang
ed7816419d Fixed redstone simulator crash found in #570 2014-01-29 19:19:14 +00:00
tonibm19
e9c1d1ea9c Did what xoft said 2014-01-29 20:02:41 +01:00
tonibm19
1c1832b6ce Rewritten code.
Implemented xoft suggestion.
Using MoveToPosition as tigerw suggested.
2014-01-29 19:15:26 +01:00
tonibm19
ba4865f7ee Fixed sheep 2014-01-29 18:32:46 +01:00
tonibm19
73d9a285d5 Fixed a copypasta error... 2014-01-29 18:25:10 +01:00