1
0
Commit Graph

1286 Commits

Author SHA1 Message Date
madmaxoft
752e57108d Merge remote-tracking branch 'origin/master' into hunger 2013-07-29 09:53:47 +02:00
FakeTruth
5a9d4f89c2 WebAdmin templates can use Lua
New WebAdmin templates can use Lua to completely compose the pages
themselves. This should allow infinite WebAdmin design possibilities.
2013-07-29 02:37:59 +02:00
madmaxoft
3bf4130e3f Player eating is now properly broadcast to other players.
Also fixed the API relating to food, determining player gamemode, and removed several unneeded API functions.
2013-07-28 22:55:09 +02:00
madmaxoft
4746d2251c Implemented basic eating support.
Food is now properly consumed and it takes 1.5 sec.
2013-07-28 19:15:03 +02:00
madmaxoft
0caadbb25c Hunger-per-distance is calculated only for the XZ distance 2013-07-28 11:54:37 +02:00
madmaxoft
d155c1cb00 Player food level is reset on respawn 2013-07-28 11:52:24 +02:00
madmaxoft
c5c233312a Merge remote-tracking branch 'origin/master' into hunger 2013-07-28 11:47:29 +02:00
madmaxoft
d3801c0296 Added cPlayer::IsGameModeXXX() and cWorld::IsGameModeXXX() functions.
These are the preferred way of determining the gamemode, you should use those instead of doing manual comparisons to the gamemode value.
2013-07-28 11:30:54 +02:00
Tiger Wang
265fa6d750 Fixed Window Titles being MCS-*
For example, MCS-Chest, MCS-DoubleChest, etc.
2013-07-27 22:32:07 +01:00
STRWarrior
235c23d464 Hunger: If a player dies the food level resets. 2013-07-27 06:07:10 -07:00
madmaxoft@gmail.com
6b348717d8 Removed debug-logging the player movement in each tick
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1685 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-26 20:03:25 +00:00
madmaxoft@gmail.com
fa66659456 cItemGrid: ChangeSlotCount() now returns -1 if invalid SlotNum
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1684 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-26 19:53:47 +00:00
madmaxoft@gmail.com
cd8720bf7e cInventory: Added the ChangeSlotCount() function to the Lua API
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1683 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-26 19:50:06 +00:00
madmaxoft@gmail.com
1b20cfa425 cEntity doesn't process physics / burning when in an invalid chunk
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1680 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-24 20:36:12 +00:00
madmaxoft@gmail.com
df34c43293 Server shuts down when the stdin is closed (linux Ctrl+D / win Ctrl+Z)
Fixes FS #419

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1679 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-24 20:25:27 +00:00
madmaxoft@gmail.com
a96ee0abfa cListenThread initializes m_ShouldReuseAddr to false (valgrind error)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1677 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-22 19:55:10 +00:00
madmaxoft@gmail.com
889402a56a Simulators don't simulate in invalid chunks (valgrind error)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1676 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-22 19:54:27 +00:00
madmaxoft@gmail.com
2fca0567bf Added a StringToMobType() function to the Lua API (patch contributed by STR_Warrior)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1674 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-12 20:28:41 +00:00
madmaxoft@gmail.com
4fb771f3ff First implementation of movement-related hunger and API
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1673 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-12 20:01:25 +00:00
madmaxoft@gmail.com
f5e475d44f Added the cFastRandom class
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1672 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-11 08:34:41 +00:00
madmaxoft@gmail.com
94a92a219b Server sends PlayerMaxSpeed after a respawn.
http://forum.mc-server.org/showthread.php?tid=434&pid=8912#pid8912

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1671 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-08 18:30:27 +00:00
madmaxoft@gmail.com
97dc5a5365 Color codes are stripped from the DC message
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1670 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-08 13:00:09 +00:00
madmaxoft@gmail.com
791bf732fd 1.6.2 protocol implemented, both in MCServer and in ProtoProxy
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1669 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-08 12:59:15 +00:00
madmaxoft@gmail.com
a40585ec99 Pickups have an initial health of 5
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1668 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-08 07:23:44 +00:00
madmaxoft@gmail.com
9214a134ca World: More unused variables removed.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1667 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-07 20:48:50 +00:00
madmaxoft@gmail.com
3df8cfb091 World: Removed an unused variable
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1666 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-07 20:41:43 +00:00
madmaxoft@gmail.com
254295b5b8 Squid: fixed a possible crash caused by access to a wrong chunk
Fixes FS #411.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1665 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-07 20:20:18 +00:00
madmaxoft@gmail.com
a72c6d9613 Ice is a solid block.
Helps with FS #381

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1664 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-07 19:58:33 +00:00
madmaxoft@gmail.com
a3c8b12ee9 Mobs are assigned MaxHealth from monsters.ini; reading monsters.ini doesn't need settings.ini values anymore.
Fixes FS #409.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1662 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-07 15:09:05 +00:00
madmaxoft@gmail.com
5951bc76ec Added StringUtils functions to Lua API; added StripColorCodes(); ChatLog now strips color codes from logged messages.
Fixes FS #398

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1661 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-07 14:42:07 +00:00
madmaxoft@gmail.com
0224a4f7fc Fixed sprinting in 1.6.1, made speeds available through API; fixed messages containing quotes.
Fixes FS #415

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1660 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-07 14:13:43 +00:00
madmaxoft@gmail.com
b1d05b0f57 Improved function names for protocol packet sending; alpha-sorted the function lists
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1659 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-07 13:06:06 +00:00
madmaxoft@gmail.com
762f78774d Declaring full 1.6.1 compatibility
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1651 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-05 21:14:55 +00:00
madmaxoft@gmail.com
37590c4bd8 Unmounting vehicles implemented in the 1.6.1 way
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1650 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-05 21:11:06 +00:00
madmaxoft@gmail.com
b818addde4 Fixed 1.6.1's movement speed
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1649 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-05 21:02:08 +00:00
madmaxoft@gmail.com
de5cec7419 Initial 1.6.1 protocol support.
The client connects and is capable of basic gameplay, but the player moves at an incredible speed (50 blocks / sec).

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1646 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-05 19:40:19 +00:00
madmaxoft@gmail.com
eff79ee55f Fixed a crash when moving a player to a non-existent world (reported by tonibm19)
http://forum.mc-server.org/showthread.php?tid=434&pid=8865#pid8865 crashdump.zip/crash_mcs_165c.dmp

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1645 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-05 17:04:12 +00:00
madmaxoft
e27a5db409 Empty buckets replace fluid buckets on use and vice versa (patch contributed by Mgueydan)
Fixes FS #277.
API change: added an optional parameter to cItemGrid:AddItem(), cItemGrid:AddItems(), cInventory:AddItem() and cInventory:AddItems()

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1643 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-03 13:56:11 +00:00
madmaxoft@gmail.com
f7b8a301f8 Fixed player moving between worlds.
Fixes FS #407.
Also fixes a few possible deadlocks between SocketThreads and TickThread

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1641 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-03 07:47:35 +00:00
madmaxoft@gmail.com
2f8eebaad1 dtOnFire damage wasn't dealt properly
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1640 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-01 18:52:24 +00:00
madmaxoft@gmail.com
37f6c78404 Added DamageType translation to API
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1639 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-01 18:46:45 +00:00
madmaxoft@gmail.com
2e9cf0ae28 Fixed burn / fire damage in each game tick.
http://forum.mc-server.org/showthread.php?tid=434&pid=8798#pid8798

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1638 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-01 18:37:27 +00:00
madmaxoft@gmail.com
37276a4430 Rewritten entity-on-fire management ("forever on fire" bugs)
Fixes FS #297 and part of FS #403.
Added sizes to all entities.
Moved all damage-related functions from cPawn to cEntity
API change: renamed cPawn:TeleportTo() to cEntity:TeleportToCoords()

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1635 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-01 10:39:56 +00:00
madmaxoft@gmail.com
623adcad0f Fixed crouch-placing unplaceable items (FS #399)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1632 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-29 15:45:46 +00:00
madmaxoft@gmail.com
7b75aaea7c Advanced RCON: Command output is sent to the RCON client.
RCON authentication is now required before executing commands.
Console command handlers now return two values, bool (IsHandled) and string (CommandOutput).
API change: removed cRoot:ExecuteConsoleCommand(), added cRoot:QueueExecuteConsoleCommand().
API change: removed cPluginManager:ExecuteConsoleCommand(), use cRoot:QueueExecuteConsoleCommand() instead

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1631 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-29 15:30:05 +00:00
madmaxoft@gmail.com
bc421842c6 Added a basic RCON protocol
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1628 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-27 15:14:20 +00:00
madmaxoft@gmail.com
f6b3ab7b42 Added a warning when spawning an entity in a non-existent chunk
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1627 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-25 06:48:17 +00:00
madmaxoft@gmail.com
4fe7801cfc Unified the way mobs are spawned (egg vs natural). Fixed deadlocks in mob moving. Fixed mob destroying code.
Should fix FS #400 and partially fix FS #381

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1626 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-25 06:36:59 +00:00
nielsbreu@gmail.com
146b3d568a The weather doesn't change if the dimension is not Overworld.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1624 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-24 16:50:32 +00:00
madmaxoft@gmail.com
943dcaea14 Plugins can modify message in the OnChat() hook handler.
FS #376

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1622 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-22 19:08:34 +00:00