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
ffe44c13d0
Moved ChatColor.h out of defines where it was not needed
2014-07-17 23:25:14 -07:00
bc94ad4b5a
Fixed NULL being passed instead of a double to AddEntityEffect
2014-07-17 14:34:58 -07:00
c03161f75d
Fixed tabs used for alignment.
2014-07-17 23:16:55 +02:00
d0cc9aedb3
More trailing whitespace fixes.
2014-07-17 23:16:54 +02:00
488ecb6912
Player.cpp: Fixed compile error
2014-07-17 14:08:54 -07:00
5c0789e15e
Player.cpp: Added Wither death message
2014-07-17 14:08:21 -07: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
e444106d09
Merge pull request #1192 from mc-server/skinuuid
...
Skins
2014-07-16 13:30:57 +02:00
8e946da8ac
Merge branch 'master' into potions
2014-07-15 09:01:32 +02:00
4e24f711ab
Player properties are now retrieved
2014-07-14 19:49:31 +01:00
d529971e27
Changed BroadcastSoundEffect function to take floating pos.
2014-07-13 02:08:02 +02:00
83c69134c0
Merge remote-tracking branch 'origin/master' into potions
2014-07-11 17:37:28 -07:00
f73042fb02
Simplified the player data loading.
2014-07-11 23:12:57 +02:00
ebea2b7efc
Player data filenames are based on UUID.
2014-07-11 13:13:10 +02:00
6cea81e383
Fixed a missing return value.
2014-07-11 00:06:58 +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
abb49d3f33
Suggestion
2014-07-02 18:51:37 +01:00
f5659a08b8
Merge remote-tracking branch 'origin/master'
...
Conflicts:
src/Entities/Player.cpp
2014-07-02 18:48:05 +01:00
c1ae5513ec
Fixed player teleport food drain
2014-07-02 18:46:13 +01:00
8e11f7a1f6
Fixes.
2014-06-30 21:50:40 +02:00
aa753a92c0
Add new hook: HOOK_PLAYER_FOOD_LEVEL_CHANGE
2014-06-30 15:12:56 +02:00
b9d4431f6f
Fixed respawning
...
* Fixes #1103
2014-06-29 22:44:16 +01:00
dde641ce83
Properly implemented enderchests
2014-06-29 11:36:38 +01:00
35dc056f03
Likely fixed too quick food depletion
...
* Fixes FS427 properly, hopefully
2014-06-28 21:10:59 +01:00
eaf36766f6
Merge branch 'master' into Bow
2014-06-26 15:49:53 +02: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
6e681269d9
Fixed invalid iterators
2014-06-21 22:07:38 +01:00
1296c5dce7
More suggestions
2014-06-21 20:42:29 +01:00
e8143de01b
Nullify deleted pointers.
2014-06-19 01:49:56 -07: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
9e8361976b
Entity Effects: Clarified user, added it to AddEntityEffect
...
Added second AddEntityEffect with a pass-by-value of the class.
2014-06-17 11:39:22 -07:00
e289fe4dd7
Changed the AddEntityEffect() params for easier calls.
2014-06-17 11:39:21 -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
73cea7065d
Entity effect type: use 'eff' as a prefix instead of 'ef'
2014-06-17 11:39:20 -07:00
1eb04a48ee
Implemented milk, added documentation to Pawn.h
2014-06-17 11:39:19 -07:00
615152eb8c
Pawn.cpp: fixed effect iterator BAD_ACCESS
...
Erasure was occurring before the iterator increased, causing a bad access. Solved by storing map pairs in variables and manually updating iterator before erasure.
Fixed mix-up in function arguments on food poisoning
2014-06-17 11:39:19 -07:00
a9a4c9c6b2
EntityEffect: read-only getters, added user and distance modifier fields
...
User: the pawn that uses or produces the entity effect (drinks/throws a potion)
Distance modifier: the potency modifier from splash potion effectivity radius
2014-06-17 11:39:19 -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
87b1bfaf2a
Moved Effects.h to EntityEffects.h, added initial impl
2014-06-17 11:17:32 -07:00
Tiger Wang
archshift
madmaxoft
Howaner