ecb86935f8
Fixed UUIDs handling in cPlayer.
...
The loading expected dashed UUIDs, MCS uses short UUIDs throughout.
2014-07-31 22:52:06 +02:00
8811837aea
Merge branch 'master' into portals
...
Conflicts:
src/World.h
2014-07-29 15:27:19 +01:00
ba36e79bc5
Merge branch 'master' into Inventory2
...
Conflicts:
src/BlockInfo.cpp
2014-07-26 13:23:11 +02:00
4191be7ddb
Removed redundant semicolons and re-added warning
2014-07-24 11:21:37 -07:00
1156914dd6
Suggestions
2014-07-23 21:12:59 +01:00
396739cc0f
Fix item durability.
...
Fixes #1181
2014-07-23 16:32:09 +02:00
a28b0dc120
Speed improvements, crash fixes, & self-suggestions
2014-07-22 17:26:48 +01:00
3385ed56b8
Merge remote-tracking branch 'origin/master' into portals
...
Conflicts:
src/Chunk.cpp
src/Entities/Player.cpp
src/Root.cpp
src/World.cpp
2014-07-22 10:24:28 +01:00
8050a5b98a
Suggestions
2014-07-21 22:49:06 +01:00
93d29555e5
Style: Normalized to no spaces before closing parenthesis.
2014-07-21 17:40:43 +02:00
6ab9afd0fd
Bug and crash fixes
...
* Fixes end portals' solidity
* Fixed crashes to do with multithreading and removing an entity from
the wrong world
* Fixed crashes due to bad merge
* Fixed crashes due to an object being deleted twice
* Simplified cWorld::Start() and added comments to configuration files
2014-07-20 10:46:45 +01:00
719551c31f
Fix failed merge and other issues
2014-07-18 20:12:27 +01:00
37140ae578
Merge branch 'master' into portals
...
Conflicts:
src/Blocks/WorldInterface.h
src/ClientHandle.cpp
src/ClientHandle.h
src/Entities/Player.cpp
src/Entities/Player.h
src/Generating/FinishGen.cpp
src/Protocol/Protocol.h
src/Protocol/Protocol125.cpp
src/Protocol/Protocol125.h
src/Protocol/Protocol16x.cpp
src/Protocol/Protocol16x.h
src/Protocol/Protocol17x.cpp
src/Protocol/Protocol17x.h
src/Protocol/ProtocolRecognizer.cpp
src/Protocol/ProtocolRecognizer.h
src/Root.h
src/World.cpp
2014-07-18 20:10:51 +01:00
c03161f75d
Fixed tabs used for alignment.
2014-07-17 23:16:55 +02:00
5e198c6730
Basic style fixes.
2014-07-17 22:50:58 +02:00
2423fbf2ef
Normalized comments.
...
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
2014-07-17 22:15:34 +02:00
7d0fc85d00
Merge branch 'master' into potions
2014-07-17 11:01:26 +02:00
98244e96d1
Merge pull request #1193 from mc-server/deathmessages
...
Death messages
2014-07-17 10:12:22 +02:00
e66b81b395
Merge remote-tracking branch 'origin/master' into potions
2014-07-17 10:06:13 +02:00
174906efca
Another fix for excessive food drain
2014-07-16 22:22:45 +01:00
83c69134c0
Merge remote-tracking branch 'origin/master' into potions
2014-07-11 17:37:28 -07:00
ebea2b7efc
Player data filenames are based on UUID.
2014-07-11 13:13:10 +02:00
2bd486660a
Preparation for player UUID-based storage: LoadFromFile()
2014-07-11 00:06:05 +02:00
e824cd09b3
Merge remote-tracking branch 'origin/master' into potions
...
Conflicts:
src/Entities/Player.cpp
src/Entities/ProjectileEntity.cpp
2014-07-09 23:28:27 -07:00
a0d2df9327
Tailored death messages
2014-07-04 10:55:09 +01:00
39fff19955
Merge pull request #1138 from mc-server/enderchest
...
Properly implemented enderchests
2014-07-02 22:59:21 +02:00
c1ae5513ec
Fixed player teleport food drain
2014-07-02 18:46:13 +01:00
dde641ce83
Properly implemented enderchests
2014-06-29 11:36:38 +01:00
7615ed90c0
Merge branch 'master' into portals
...
Conflicts:
src/Chunk.cpp
src/Entities/Entity.h
src/Entities/Player.h
2014-06-21 22:14:23 +01:00
1296c5dce7
More suggestions
2014-06-21 20:42:29 +01:00
f5529e544c
EntityEffects.x -> EntityEffect.x, Object-Oriented effects
...
Changed effect map to take a pointer of the effect as a result.
2014-06-18 22:54:14 -07:00
5b2b6e0615
Pawn: renamed HandleEntityEffects to HandleEntityEffect
...
Exported entity effect functions for ToLua and documented them in APIDesc.lua
2014-06-17 11:39:21 -07:00
8eceaf9b0c
Player: made healing instantaneous
2014-06-17 11:39:20 -07:00
2123173202
Player: Removed food-poisoning-specific code, set duration to 30 seconds
...
http://minecraft.gamepedia.com/Hunger#Behavior
2014-06-17 11:39:19 -07:00
481f05b011
Entity effects: Added handlers for entity effects
...
Implemented hunger, instant health, damage, poison, regen
Added "template" entity effect implementations
2014-06-17 11:39:19 -07:00
e50423991e
Add bow charging animation
2014-06-16 21:57:23 +02:00
ee50790398
Merge branch 'master' of github.com:mc-server/MCServer
2014-06-16 15:12:50 +01:00
b2fbcaf1bf
Implemented PR suggestions
...
Furnace.txt: newline
BlockID: removed extraneous dimension mapping
cEntity: fixed typo
cPlayer: WorldPtr typedef
2014-06-15 20:27:27 -07:00
29567c5610
Portals animate and delay correctly
2014-06-12 15:21:07 +01:00
bfa8aaf41b
Merge branch 'master' into portals
...
Conflicts:
src/ClientHandle.cpp
src/Entities/Player.cpp
src/Entities/Player.h
src/Protocol/Protocol125.cpp
src/Protocol/Protocol17x.cpp
2014-06-10 20:51:22 +01:00
b904223b9d
Added queue for adding entities to cWorld.
...
This alone doesn't work properly yet, further changes to cPlayer are needed.
2014-06-08 21:58:29 +02:00
74cd4f5521
Suggestions
2014-06-04 18:59:56 +01:00
576f89c1d5
Implemented bed homes
...
+ Implemented bed home positions
* Fixed some inventory and health server/client mismatches after world
change
2014-06-01 18:46:59 +01:00
8bff3e5af2
Implemented end and nether portals
2014-05-31 22:28:51 +01:00
07baf9bdd3
Cleaned up cPlayer::UpdateMovementStats; Wither achievements
2014-05-20 15:52:59 +03:00
466ff2204f
Fixes
2014-05-13 14:53:15 +03:00
aea866f5b1
Movement Statistics
2014-05-12 21:38:52 +03:00
b3d2b5b2c9
cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement()
2014-05-12 17:05:09 +03:00
c7c3724a3e
Statistic Manager
2014-05-11 14:57:06 +03:00
839447f0bb
Merge branch 'master' into fixes.
2014-05-02 19:34:28 +02:00
7e76f030aa
Add entity invulnerable
2014-04-26 00:32:30 +02:00
48904ae201
Merge branch 'master' into fixes
...
Conflicts:
src/World.h
2014-04-24 18:57:25 +01:00
7f5cf417de
Some change to Entity.cpp
...
* Added comments to BroadcastMovementUpdate() and the collision tracer
2014-04-23 21:06:46 +01:00
f48d43f050
Fixed Flint and Steel, reverted Minecart change, renamed a parameter name
2014-04-19 20:51:52 +02:00
013da806ec
Did some static analysis, fixed some bugs and optimized a lot of code
2014-04-18 21:09:44 +02:00
1cab52f867
Added cPlayer:SendRotation() API function.
2014-04-05 12:09:30 +02:00
b370cacf0c
Plugins can set flying speed.
2014-03-20 16:14:40 +01:00
64d9390069
Rewritten player speeds to be relative unit-less.
...
Value of 1 means "default speed", 2 means "double the speed", 0.5 means "half the speed". This allows for easier plugins and is more future-proof.
2014-03-20 15:45:42 +01:00
4ec402e6f9
Merge pull request #782 from mc-server/beds
...
Beds now work properly, fixes #707
2014-03-16 21:47:34 +01:00
b64e9fb7f5
Beds now work properly fixes #707
...
Also fixes FS392
Conflicts:
src/Blocks/WorldInterface.h
src/ClientHandle.cpp
2014-03-09 15:32:34 +00:00
c05a1db88d
CheckBlockInteractionsRate() fixed & enabled
2014-03-09 12:48:52 +00:00
ea55a22a71
Links sent via chat messages are clickable.
...
Fixes #658 .
2014-02-16 23:51:32 +01:00
4908b6f500
Fixed minor formatting issues from #682
...
- Removed unused PlaySoundEffect
* Simplified and parenthesised code
2014-02-16 13:37:36 +00:00
f3bd288f02
Add Exp Bottle Effects
2014-02-16 01:19:30 +01:00
0f1f7583ae
Implemented cCompositeChat.
...
This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions.
Fixes #678 .
2014-02-15 23:17:49 +01:00
9d1c9097e3
Merge remote-tracking branch 'origin/master' into playerimprovements
...
Conflicts:
src/Root.cpp
src/Root.h
src/World.cpp
2014-02-09 00:14:42 +00:00
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
3450f0ca42
Added more chat functions
2014-02-05 23:24:02 +00:00
89ec774fd6
Removed deprecated HasCommand function
2014-02-05 20:20:11 +01:00
ea2ce1595f
Fixed annoying creative on fire bug
2014-02-04 23:27:13 +00:00
9eeeb91fa6
Added more SendMessageXXX() functions
2014-02-04 22:39:57 +00:00
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
7468ba0f10
Implemented fall damage for mobs
...
+ Implemented mobile fall damage
* Formatting fixes
+ Defined new Position->Integer macros
2014-01-25 19:02:13 +00:00
fd7fc7e59e
All mobs now drown ( fixes #54 )
...
* Implemented mob drowning
* Iron Golems and squids are excluded
2014-01-24 23:58:51 +00:00
8a254faaf7
Merge remote-tracking branch 'MikeHunsinger/master'
2014-01-24 08:55:41 +01:00
11948b1d4b
Fixed spacing and doxycomments.
2014-01-23 19:54:00 -07:00
41b05416c7
Split TossItem into three Toss functions (Held, Equipped and Pickup)
2014-01-23 00:27:39 -07:00
7728f4bcbe
Scoreboard deserialization
2014-01-20 16:10:39 +02:00
2b94361059
Basic scoreboard implementation
2014-01-19 14:20:57 +02:00
edefa27a48
Detaching improvements
...
* Players now search for an area around themselves to teleport to when
detaching from something
2014-01-12 23:23:36 +00:00
d724241407
converted commneted paramater names to the unused macro
2013-12-22 13:46:55 +00:00
94ca07cfbf
Merge branch 'master' of github.com:mc-server/MCServer
2013-12-22 13:19:27 +00:00
bd6574230a
Floater now dissapears when the player doesn't have an fishing rod equipped.
2013-12-21 17:31:05 +01:00
9f41761e8e
Root is now warnings clean
2013-12-21 15:38:37 +00:00
d6de11da07
Sorted a few constructors to remove warnings.
2013-12-20 16:39:20 +01:00
3d70d7198d
Implented IsFishing, SetIsFishing and GetFloaterID().
2013-12-19 17:33:21 +01:00
f521cbeb31
Fixed cClientHandle::Tick() being called from two threads.
...
When the player was initialized, the Tick() function continued to stream chunk, while the cWorld called Tick() from its tick thread.
Final fix for #187 .
2013-12-16 10:41:51 +01:00
5e75408b3b
Renamed ShootTo function to ForceSetSpeed.
2013-12-15 20:19:58 +01:00
0efd74f114
This adds a function that allows you to 'shoot' a player towards a direction.
2013-12-15 18:54:54 +01:00
b10d0b95cb
Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() function
2013-12-15 14:48:17 +01:00
c3cd436ec3
Merge remote-tracking branch 'origin/master' into foldermove2
...
Conflicts:
GNUmakefile
2013-11-24 14:37:03 +00:00
675b4aa878
Moved source to src
2013-11-24 14:19:41 +00:00
madmaxoft
Tiger Wang
Howaner
archshift
Tycho
andrew
jfhumann
STRWarrior
Mike Hunsinger
Tycho Bickerstaff
Alexander Harkness