1
0
Commit Graph

631 Commits

Author SHA1 Message Date
madmaxoft
8e946da8ac Merge branch 'master' into potions 2014-07-15 09:01:32 +02:00
Tiger Wang
ad6494fb36 Maybe improved arrow sinking 2014-07-14 21:56:40 +01:00
archshift
061010288a Readability and clarity changes 2014-07-14 13:46:43 -07:00
Tiger Wang
4e24f711ab Player properties are now retrieved 2014-07-14 19:49:31 +01:00
archshift
0409daf736 EntityEffect: Inlined functions, added explicit copy constructor and operator. 2014-07-13 15:43:49 -07:00
archshift
f77723128c Changed separating comment style from asterisks to slashes. 2014-07-13 15:23:23 -07:00
worktycho
4a6d606f74 Made CreateProjectile a pointer 2014-07-13 15:16:49 +01:00
Howaner
d529971e27 Changed BroadcastSoundEffect function to take floating pos. 2014-07-13 02:08:02 +02:00
Tiger Wang
5f72cdac38 Merge pull request #1154 from mc-server/trappedchests
Implemented trapped chests & others
2014-07-12 23:24:32 +01:00
archshift
8cbd43e043 Added splash potions to NBT serialization and retrieval 2014-07-11 18:58:11 -07:00
archshift
83c69134c0 Merge remote-tracking branch 'origin/master' into potions 2014-07-11 17:37:28 -07:00
archshift
4e6395d6ff For now, removed creator member from Entity Effect for pointer safety 2014-07-11 17:27:29 -07:00
madmaxoft
f73042fb02 Simplified the player data loading. 2014-07-11 23:12:57 +02:00
madmaxoft
ebea2b7efc Player data filenames are based on UUID. 2014-07-11 13:13:10 +02:00
madmaxoft
6cea81e383 Fixed a missing return value. 2014-07-11 00:06:58 +02:00
madmaxoft
2bd486660a Preparation for player UUID-based storage: LoadFromFile() 2014-07-11 00:06:05 +02:00
archshift
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
Tiger Wang
74b6b398e7 Fixed arrow collection animation
* Fixed piston extension non-solidness
2014-07-09 19:56:50 +01:00
Tiger Wang
372dbbb994 Merge pull request #1135 from mc-server/fixes
Fixes to projectiles and the undead
2014-07-09 09:50:38 +01:00
Tiger Wang
7c7501abc5 Added extra space before comments 2014-07-07 21:14:15 +01:00
Tiger Wang
9e44b0aae1 Implemented trapped chests & others
+ Added trapped chests
* Fixed a bunch of bugs in the redstone simulator concerning wires and
repeaters
* Other potential bugfixes
2014-07-06 23:50:22 +01:00
Tiger Wang
460d6bd0cb Changed everything to callbacks 2014-07-05 22:59:22 +01:00
Tiger Wang
f4e11d194e Crash and compile fix 2014-07-04 22:07:26 +01:00
Tiger Wang
79e558be34 Suggestions 2014-07-04 17:42:40 +01:00
Tiger Wang
f4e3c01a71 Various fixed
* Fixed potential invalid pointer dereferencing, fixes #1117
* Fixed ender pearls not being loaded properly
2014-07-04 16:49:24 +01:00
Tiger Wang
f635066241 Eps comparison 2014-07-04 12:50:40 +01:00
Tiger Wang
a0d2df9327 Tailored death messages 2014-07-04 10:55:09 +01:00
Mattes D
39fff19955 Merge pull request #1138 from mc-server/enderchest
Properly implemented enderchests
2014-07-02 22:59:21 +02:00
Tiger Wang
89a26cc786 Suggestions 2014-07-02 21:07:34 +01:00
Tiger Wang
abb49d3f33 Suggestion 2014-07-02 18:51:37 +01:00
Tiger Wang
f5659a08b8 Merge remote-tracking branch 'origin/master'
Conflicts:
	src/Entities/Player.cpp
2014-07-02 18:48:05 +01:00
Tiger Wang
c1ae5513ec Fixed player teleport food drain 2014-07-02 18:46:13 +01:00
Tiger Wang
284c1c0514 Vector clamping fixes
Thank you, @madmaxoft.
2014-07-01 22:39:37 +01:00
Howaner
8e11f7a1f6 Fixes. 2014-06-30 21:50:40 +02:00
Tiger Wang
85fae0e521 Implemented Vector3<>::Floor() 2014-06-30 19:21:21 +01:00
Howaner
aa753a92c0 Add new hook: HOOK_PLAYER_FOOD_LEVEL_CHANGE 2014-06-30 15:12:56 +02:00
Tiger Wang
b9d4431f6f Fixed respawning
* Fixes #1103
2014-06-29 22:44:16 +01:00
Tiger Wang
428cfb5c21 Suggestions 2014-06-29 22:41:31 +01:00
Tiger Wang
dde641ce83 Properly implemented enderchests 2014-06-29 11:36:38 +01:00
Tiger Wang
536cb62f1c An unification of code style 2014-06-28 21:14:10 +01:00
Tiger Wang
35dc056f03 Likely fixed too quick food depletion
* Fixes FS427 properly, hopefully
2014-06-28 21:10:59 +01:00
Tiger Wang
b6df30831d Fixed server forcing players afloat
* Fixes #1131
2014-06-27 23:13:26 +01:00
Mattes D
e60b73ce69 Merged branch 'howaner/Bow'.
Removed the pickup collection broadcast due to bad code.
2014-06-26 18:42:28 +02:00
Mattes D
4826990ea0 Merged branch 'howaner/Pickups'. 2014-06-26 18:35:38 +02:00
Howaner
bf3229867b Add comment. 2014-06-26 17:26:47 +02:00
Howaner
cba273dc7e Fixed a comment and changed CombineCount to short. 2014-06-26 17:20:48 +02:00
Howaner
f96955496f GameMode check 2014-06-26 15:56:03 +02:00
Howaner
eaf36766f6 Merge branch 'master' into Bow 2014-06-26 15:49:53 +02:00
Howaner
dbcb7f819f Optimize combining. 2014-06-24 17:50:38 +02:00
Howaner
2dd7a0373b Better combining. 2014-06-24 16:19:22 +02:00
Howaner
5ab01c4d42 Fix pickup combining over the maximum stack size. 2014-06-24 15:27:19 +02:00
Tiger Wang
4238b0ebe8 Some Entity.cpp style improvements 2014-06-22 20:44:18 +01:00
Tiger Wang
33cc1f2a50 Fixed multiple issues with projectiles
* Fixed arrows not being collectable/not truly hitting a block/not
lodging into blocks/not going in far enough
* Fixed projectiles not playing their block hit animation owning to
being destroyed too quickly
2014-06-22 20:44:01 +01:00
Tiger Wang
e709652257 Conforms to standards 2014-06-22 00:21:39 +01:00
Tiger Wang
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
Tiger Wang
6e681269d9 Fixed invalid iterators 2014-06-21 22:07:38 +01:00
Tiger Wang
1296c5dce7 More suggestions 2014-06-21 20:42:29 +01:00
archshift
e8143de01b Nullify deleted pointers. 2014-06-19 01:49:56 -07:00
archshift
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
archshift
68c30790db Entity effects: changed User to Creator, removed pawn pass-by-value 2014-06-17 11:39:22 -07:00
madmaxoft
fa1d85feca Added the OnEntityAddEffect hook. 2014-06-17 11:39:22 -07:00
archshift
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
madmaxoft
e289fe4dd7 Changed the AddEntityEffect() params for easier calls. 2014-06-17 11:39:21 -07:00
archshift
22761bb6ad Entity Effect: Separates total duration and ticks of activity
Changed HandleEntityEffect to use cEntityEffect's ticks instead of a static counter
2014-06-17 11:39:21 -07:00
madmaxoft
045ae2ef2c Fixed MSVC compilation. 2014-06-17 11:39:21 -07:00
archshift
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
archshift
71b4c49490 Cave spider now poisons its victim, added IsPawn function to Entity 2014-06-17 11:39:21 -07:00
archshift
814cdca054 Added wither damage type, wither entity effect. 2014-06-17 11:39:21 -07:00
archshift
2574573c88 Monster: added IsUndead(), undead-specific entity effects 2014-06-17 11:39:20 -07:00
archshift
52abd90a28 Applies splash potion effects to mobs as well as players 2014-06-17 11:39:20 -07:00
archshift
68011a004a Removed long function wrapping 2014-06-17 11:39:20 -07:00
archshift
73cea7065d Entity effect type: use 'eff' as a prefix instead of 'ef' 2014-06-17 11:39:20 -07:00
archshift
58f35af6e7 Added splash potion functionality 2014-06-17 11:39:20 -07:00
archshift
5803094d7d Entity: only fire critical hit if damage type is physical 2014-06-17 11:39:20 -07:00
archshift
8eceaf9b0c Player: made healing instantaneous 2014-06-17 11:39:20 -07:00
archshift
2185c72c2c Implemented drinkable potions, noeffect entity effect,
Clears entity effects on death
2014-06-17 11:39:20 -07:00
archshift
1eb04a48ee Implemented milk, added documentation to Pawn.h 2014-06-17 11:39:19 -07:00
archshift
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
archshift
e98ffccd80 Pawn: Enabled entity effect broadcast, added typedef
Typedef'd std::map<cEntityEffect::eType, cEntityEffect> to tEffectMap
2014-06-17 11:39:19 -07:00
archshift
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
archshift
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
archshift
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
archshift
90145a9514 Added iterator on tick to manage entity effect duration 2014-06-17 11:17:33 -07:00
archshift
aa7b3f33b9 cPawn: Remove unused m_bBurnable 2014-06-17 11:17:33 -07:00
archshift
87b1bfaf2a Moved Effects.h to EntityEffects.h, added initial impl 2014-06-17 11:17:32 -07:00
archshift
c1692a2e3b Added classes for splash potions and wither skulls 2014-06-17 11:17:32 -07:00
Howaner
c60ba8a52d Merge branch 'master' into GlobalFixes 2014-06-17 19:03:56 +02:00
Howaner
ce06ec1632 derp 2014-06-17 13:33:41 +02:00
Howaner
37de63895f The same: Float, not Double 2014-06-17 12:45:12 +02:00
Howaner
d89f03b90c Float, not Double 2014-06-17 12:43:45 +02:00
Howaner
a1fd0b0335 Split Broadcast Sound Effect function call in multiple lines. 2014-06-16 23:41:23 +02:00
Howaner
885a50d77a Fix bow sound and creative arrow pickup. 2014-06-16 22:57:13 +02:00
Howaner
e50423991e Add bow charging animation 2014-06-16 21:57:23 +02:00
Tycho
ee50790398 Merge branch 'master' of github.com:mc-server/MCServer 2014-06-16 15:12:50 +01:00
archshift
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
Tiger Wang
8a80843ddf Reverted portal creation code
It wasn't really working and needs more development
2014-06-14 10:18:16 +01:00
worktycho
e10940d57c Fixed compile 2014-06-12 17:24:14 +01:00
Tiger Wang
29567c5610 Portals animate and delay correctly 2014-06-12 15:21:07 +01:00
Tiger Wang
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
Tiger Wang
35b79e5d71 Portal improvements and suggestions 2014-06-10 20:43:27 +01:00
Mattes D
af4a21ea06 Fixed deadlock when moving players to other worlds.
Fixes #1039, fixes #851
2014-06-08 21:58:30 +02:00
Mattes D
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
Tiger Wang
f22a1b226c Fixed compilation 2014-06-05 08:25:26 +01:00
Tiger Wang
873043c8e4 Suggestions 2014-06-04 21:51:19 +01:00
Tiger Wang
ccbf6cc446 Configurable portals 2014-06-04 20:00:55 +01:00
Tiger Wang
74cd4f5521 Suggestions 2014-06-04 18:59:56 +01:00
Howaner
33fbdedea3 Fix itemframe break. 2014-06-04 15:16:30 +02:00
Tiger Wang
01f38d8836 Added checks for no downfall biomes 2014-06-04 13:22:50 +01:00
Tiger Wang
86e5273cd1 Merge remote-tracking branch 'origin/master' into portals 2014-06-04 13:14:38 +01:00
madmaxoft
c0015d01c6 Player permissions aren't logged to console anymore.
This was only logspam on most servers and there are alternative ways to list players' permissions.
2014-06-03 19:50:27 +02:00
Mattes D
61edb83ce5 Merge pull request #844 from mc-server/ProjectileHitBlock
OnProjectileHitBlock tweak.
2014-06-01 20:10:03 +02:00
Tiger Wang
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
Tiger Wang
8bff3e5af2 Implemented end and nether portals 2014-05-31 22:28:51 +01:00
STRWarrior
d1b23060ad Used recommendations 2014-05-31 14:14:55 +02:00
Mattes D
0b758946ac Merge pull request #951 from worktycho/chunksparsing/structs
Chunksparsing with segments
2014-05-31 10:12:54 +02:00
Howaner
92d9ab0f6d Wrong arrow commit. 2014-05-30 22:25:57 +02:00
Howaner
e7a7c45c36 Add throw sound and fix arrow server crash. 2014-05-28 16:39:59 +02:00
Howaner
d4f90259b8 Fix Y-Position from arrow entity. 2014-05-28 16:12:10 +02:00
Tiger Wang
f55f5ec47f Merge branch 'master' into achievementtranslate
Conflicts:
	src/Entities/Player.cpp
2014-05-24 23:21:39 +01:00
Tycho
4ab8288116 Merge branch 'master' into chunksparsing/structs 2014-05-24 12:44:49 +01:00
Mattes D
941cb88ae4 Fixed datatype conversion warning. 2014-05-23 12:33:30 +02:00
xdot
671c73c639 Merge pull request #1015 from mc-server/Stats
Statistics
2014-05-21 11:14:44 +03:00
andrew
07baf9bdd3 Cleaned up cPlayer::UpdateMovementStats; Wither achievements 2014-05-20 15:52:59 +03:00
Alexander Harkness
507df71845 Update Player.cpp 2014-05-20 13:35:39 +01:00
Tiger Wang
2bfe962e28 Fixed a cactus Y position issue 2014-05-19 22:15:39 +01:00
Tiger Wang
4008af6925 Simplified cacti conditions 2014-05-19 21:17:28 +01:00
Tiger Wang
42c36429d7 Added client translation to achievements 2014-05-19 20:40:56 +01:00
Alexander Harkness
1de4408a18 Merge pull request #1010 from mc-server/cactidamage
Implemented cacti damage
2014-05-19 14:01:50 +01:00
Alexander Harkness
6de0257bbe Derp 2014-05-19 13:31:19 +01:00
Alexander Harkness
dc39d88d3f Should have fixed assumptions about entity width.
@madmaxoft can you comment?
2014-05-19 10:35:21 +01:00
Alexander Harkness
70cf4a5eaf Fixed clanging errors.
Please @tigerw make sure this is correct.
2014-05-19 07:31:53 +01:00
Tiger Wang
6167c79e7a Implemented cacti damage
+ Implemented cacti damage
* Fixed pickup tossing (PR #994 bug)
2014-05-18 22:41:42 +01:00
madmaxoft
a651c865e4 There's no "round" function in MSVC2008. 2014-05-18 22:49:27 +02:00
andrew
466ff2204f Fixes 2014-05-13 14:53:15 +03:00
andrew
aea866f5b1 Movement Statistics 2014-05-12 21:38:52 +03:00
andrew
b3d2b5b2c9 cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement() 2014-05-12 17:05:09 +03:00
andrew
6cb3483954 Fixed compilation 2014-05-11 21:41:25 +03:00
andrew
e3c6c8f3dd Fixed stat serialization 2014-05-11 20:30:54 +03:00
andrew
c7c3724a3e Statistic Manager 2014-05-11 14:57:06 +03:00
Tycho
d478e3cfb1 Merge branch 'master' into chunksparsing/structs
Conflicts:
	src/Chunk.h
2014-05-10 05:05:44 -07:00
worktycho
17c7c31130 Initialise m_HasTeleported in both constructors 2014-05-09 16:56:29 +01:00
Tiger Wang
696a7bc52e Merge branch 'master' into fixes
Conflicts:
	src/Vector3.h
2014-05-06 20:15:19 +01:00
Tiger Wang
cca8376a01 Suggestions'd #2 2014-05-06 19:38:01 +01:00
Tiger Wang
1df7dbe7c9 Suggestions'd 2014-05-05 23:45:35 +01:00
Tiger Wang
0d1804e439 Merge branch 'master' into redstoneimprovements
Conflicts:
	src/ClientHandle.cpp
	src/Entities/FallingBlock.cpp
	src/Mobs/AggressiveMonster.cpp
	src/Simulator/IncrementalRedstoneSimulator.cpp
2014-05-04 14:15:10 +01:00
madmaxoft
5082d55e85 A bit of reformatting. 2014-05-02 19:40:12 +02:00
madmaxoft
839447f0bb Merge branch 'master' into fixes. 2014-05-02 19:34:28 +02:00
Tycho
8780b324ff Merge branch 'master' into chunksparsing/structs 2014-05-01 11:50:40 -07:00
madmaxoft
dffd38e53b Fixed a MSVC warning. 2014-04-28 22:21:49 +02:00
Mattes D
709015369d Merge pull request #940 from Howaner/GlobalFixes
Add entity invulnerable
2014-04-28 20:58:15 +02:00
Mattes D
c063051645 Merge pull request #954 from mc-server/projectiles-split
Totally refactored ProjectileEntity.h, splitting up into several files.
2014-04-28 12:32:02 +02:00
archshift
9b0cb3fd97 Fixed projectile source filenames, indentations 2014-04-27 17:05:18 -07:00
madmaxoft
9dc9713a9c Fixed warnings. 2014-04-27 23:12:52 +02:00
archshift
15324f3bbd Fixed ToLua errors, added newlines 2014-04-27 09:42:31 -07:00
Tiger Wang
bbc5faa723 Redstone simulator now directly accesses cChunk
* Redstone simulator performance improvements
* Added return values to some functions
* Minor fixes
2014-04-27 17:35:41 +01:00
Tycho
57b8ee9163 Merge branch 'master' into chunksparsing/structs
Conflicts:
	src/Chunk.cpp
	src/Chunk.h
2014-04-27 06:35:27 -07:00
archshift
cc39d314ae Fixed ToLua issues 2014-04-26 17:58:06 -07:00
archshift
e3c3795aa4 Moved cFireworkEntity out of ProjectileEntity.h 2014-04-26 17:50:05 -07:00
archshift
cb93a57963 Moved cGhastFireballEntity out of ProjectileEntity.h 2014-04-26 17:41:07 -07:00
archshift
de7eaa5735 Moved cFireChargeEntity out of ProjectileEntity.h 2014-04-26 17:35:31 -07:00
archshift
08b77f4880 Moved cThrownSnowballEntity out of ProjectileEntity.h 2014-04-26 17:24:44 -07:00
archshift
2f9580ad65 Moved cExpBottleEntity out of ProjectileEntity.h 2014-04-26 17:19:45 -07:00
archshift
bc5c28a0be Moved cThrownEnderPearl out of ProjectileEntity.h 2014-04-26 17:08:39 -07:00
archshift
de23a115a5 Moved cThrownEggEntity out of ProjectileEntity.h 2014-04-26 17:02:47 -07:00
archshift
477b3e7861 Moved cArrowEntity out of ProjectileEntity.h 2014-04-26 16:45:39 -07:00
Tiger Wang
15767badac A tiny speed improvement in ApplyFoodExhaustion() 2014-04-26 23:52:18 +01:00
Tiger Wang
b4b3b5ce64 More comments!
* Also fixed a potential issue with position sending - if someone moved
slowly enough, their position would never be updated.
2014-04-26 23:50:24 +01:00
archshift
e2194e6e90 Added static const, initialized fields. 2014-04-26 15:32:14 -07:00
Mattes D
da931da603 Merge pull request #941 from archshift/master
Fixed lots of warnings, and other small changes.
2014-04-26 23:26:59 +02:00
archshift
7841bad27a More small fixes. 2014-04-26 14:05:00 -07:00
Tycho
e40f9d6e5b Implemented Chunk Sparsing with segments 2014-04-26 10:50:23 -07:00
archshift
aef2c8ec62 Further refactored, Reverted Minecart change
Other small changes.
2014-04-26 09:25:30 -07:00
Howaner
49f6819829 Fixes 2014-04-26 16:44:15 +02:00
archshift
acff6148b6 Moved switch{} out of GetArmorCoverAgainst(). 2014-04-25 19:49:08 -07:00
archshift
73edd2b961 Fixed a couple more warnings. 2014-04-25 17:15:12 -07:00
Howaner
e5683ede63 Change m_InvulnerableTicks description again again :D 2014-04-26 00:41:00 +02:00
Howaner
ed1aa02d0c Change m_InvulnerableTicks description again. 2014-04-26 00:37:40 +02:00
Howaner
ad1410f46e Change m_InvulnerableTicks description 2014-04-26 00:37:09 +02:00
Howaner
7fd9fe9d5f Merge branch 'master' into GlobalFixes 2014-04-26 00:34:42 +02:00
Howaner
7e76f030aa Add entity invulnerable 2014-04-26 00:32:30 +02:00
Mattes D
a4f21908b2 Merge pull request #920 from axisd/master
Mobs shouldn't burn when it's Raining
2014-04-25 23:48:00 +02:00
Mattes D
43cca14763 Merge pull request #935 from archshift/projectile-fixes
Chicken eggs and ender pearls can hit entities.
2014-04-25 23:41:04 +02:00
archshift
e47dab84f3 Cmake generated projects for IDEs include headers in project files. 2014-04-25 09:56:15 -07:00
archshift
8aa82d048d Creator not user. 2014-04-25 06:26:08 -07:00
archshift
256691461b Comments for TrySpawnChicken() and TeleportUser(). 2014-04-25 05:49:18 -07:00
archshift
cb7f1ee4bb Rename spawn chicken method, Initialize m_HasTeleported. 2014-04-25 05:39:35 -07:00
r.ramazanov
4cd2d57c64 Fix formatting 2014-04-25 12:06:22 +04:00
r.ramazanov
827c3760db Fix for clang 2014-04-25 10:58:48 +04:00
r.ramazanov
a72744f5c3 Mobs shouldn't burn when it's Raining & Mob Knockback is far too much 2014-04-25 10:08:36 +04:00
archshift
ec9787bae2 Chicken eggs and ender pearls can hit entities.
Fixed warning by adding dedicated m_HasTeleported for fired arrows.
2014-04-24 19:16:16 -07:00
Tiger Wang
c949c1e755 Implemented suggestions 2014-04-24 22:03:47 +01:00
Tiger Wang
48904ae201 Merge branch 'master' into fixes
Conflicts:
	src/World.h
2014-04-24 18:57:25 +01:00
Tiger Wang
7f5cf417de Some change to Entity.cpp
* Added comments to BroadcastMovementUpdate() and the collision tracer
2014-04-23 21:06:46 +01:00
r.ramazanov
103c867f1f Merge branch 'master' of https://github.com/mc-server/MCServer 2014-04-23 18:15:28 +04:00
r.ramazanov
5deb35c5cf Mobs shouldn't burn when it's Raining #906
Mob Knockback is far too much #776
2014-04-23 18:15:04 +04:00
Mattes D
0d0e0af2d8 Merge pull request #925 from archshift/master
Added monsters.ini rule for fireproof mobs.
2014-04-23 09:46:06 +02:00
archshift
8768669428 Renamed getter and setter for IsFireproof. 2014-04-23 00:12:37 -07:00
archshift
a37b36adab Fireproof status getter and setter. 2014-04-22 12:59:31 -10:00
Mattes D
b3a9b73278 Merge pull request #923 from archshift/master
Added flag for fireproof entities.
2014-04-22 15:04:04 +02:00
archshift
06f41699af Fixed indentation and changed m_Fireproof to m_IsFireproof. 2014-04-22 02:36:39 -10:00
archshift
bca7f29490 Lay foundation for fireproof entities.
Prevent any entities with the m_Fireproof flag from taking fire or lava damage.
2014-04-22 01:59:34 -10:00
Mattes D
6492aa000b Merge pull request #909 from jfhumann/fixes
Bug fixes and optimizations.

We need to visit the API functions and check that they return only those values expected. `cWorld::CreateProjectile()` seems affected, too, by the same issue of ToLua returning extra values. In the cleanest form, these functions will need moving to ManualBindings.cpp
2014-04-22 13:34:32 +02:00
jfhumann
865e8e22e5 reverted the revert of the minecart collision detection fix. 2014-04-21 14:04:36 +02:00
r.ramazanov
a967313839 Mobs shouldn't burn when it's Raining #906 2014-04-21 13:13:25 +04:00
jfhumann
f48d43f050 Fixed Flint and Steel, reverted Minecart change, renamed a parameter name 2014-04-19 20:51:52 +02:00
jfhumann
67344a3782 Merge remote-tracking branch 'origin/master' into fixes
Conflicts:
	src/Authenticator.cpp
	src/ClientHandle.cpp
	src/Entities/Minecart.cpp
	src/Protocol/Protocol17x.cpp
2014-04-18 21:44:58 +02:00
jfhumann
013da806ec Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
Tiger Wang
6cb63a768d Fixed #906 2014-04-18 12:59:14 +01:00
Mattes D
b7e074b10b Merge pull request #891 from mc-server/fixes
Fixes to redstone & general
2014-04-17 22:37:00 +02:00
Tiger Wang
bdea8706d8 Added new AI rules
+ Added new AI rules handling cacti and large heights
* Fixed cIniFile not recognising comments in cIniFile::ReadFile()
* Fixed users.ini not being properly generated
* Changed all instances of (int)floor(GetPosXXX()) to POSXXX_TOINT
2014-04-17 18:50:25 +01:00
Tiger Wang
c0c47d33c5 Entities handle chunks properly again
* Entities properly handle chunks
* Changed EntityStatus enums to be less shouty
2014-04-12 13:16:48 +01:00
madmaxoft
143a5e61fc Fixed Endiannes conversion routines for floats and doubles.
This bug has been introduced in 8825d30aab.
This change fixes #854.
2014-04-05 22:34:05 +02:00
madmaxoft
d43c5a9c47 Removed debugging log from entity physics handling. 2014-04-05 22:25:40 +02:00
madmaxoft
1cab52f867 Added cPlayer:SendRotation() API function. 2014-04-05 12:09:30 +02:00
madmaxoft
e304bd08a2 Documented the units and range for entity rotations. 2014-04-03 21:44:03 +02:00
Tycho
b449ad8613 Merge branch 'MacFixes'
Conflicts:
	src/DeadlockDetect.cpp
	src/World.cpp
2014-04-02 06:54:57 -07:00
STRWarrior
36e1e57d03 Using recommendations (I think) 2014-03-30 17:21:13 +02:00
STRWarrior
66f1bb7b67 Added a BlockHitPos parameter to OnProjectileHitBlock 2014-03-30 14:04:44 +02:00
STRWarrior
47d5395d24 Added a blockface parameter to the OnProjectileHitBlock hook. 2014-03-30 13:44:28 +02:00
Mattes D
37812813d3 Merge pull request #842 from mc-server/ProjectileHooks
Projectile hooks
2014-03-29 22:32:50 +01:00
STRWarrior
98a12127ce Fixed the OnProjectileHitBlock hook not stopping projectiles. 2014-03-29 17:05:24 +01:00
STRWarrior
ec4638a228 Added HOOK_PROJECTILE_HIT_BLOCK. 2014-03-29 16:00:45 +01:00
STRWarrior
a6ef40cb6e Fixed error when the hook gets called. 2014-03-29 15:43:03 +01:00
STRWarrior
339d555111 Added HOOK_PROJECTILE_HIT_ENTITY 2014-03-29 15:26:41 +01:00
Tiger Wang
6dea7993f2 Fixed #721 and FS439 2014-03-28 23:25:11 +00:00
andrew
2e28c09770 Ender crystals 2014-03-25 20:59:33 +02:00
Samuel Barney
eb3cc729d4 More fixes to get it to compile for me on Mac 10.9. Mostly just newline additions, but some of the unused variables were causing errors, so I wrapped them in #ifndef __APPLE__ calls, since I didn't know if they were going to be used in the future.
Also had to undefine TOLUA_TEMPLATE_BIND a couple of times.
2014-03-25 11:15:05 -06:00
Samuel Barney
d77a6417f6 Added newlines. Without them, the files would not compile. 2014-03-25 10:33:52 -06:00
madmaxoft
b370cacf0c Plugins can set flying speed. 2014-03-20 16:14:40 +01:00
madmaxoft
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
Tiger Wang
a0720a65d6 Minor Entity.cpp cleanup 2014-03-19 23:07:16 +00:00
Tiger Wang
b8fe024f9d Merge branch 'master' into awesometnt
Conflicts:
	src/ChunkMap.cpp
2014-03-18 20:49:08 +00:00
Mattes D
4ec402e6f9 Merge pull request #782 from mc-server/beds
Beds now work properly, fixes #707
2014-03-16 21:47:34 +01:00
Howaner
8316ae330e Merge branch 'master' into BlockEntitys 2014-03-15 02:46:18 +01:00
Howaner
7ac7304c91 Add item frame saving. 2014-03-15 02:45:25 +01:00
Howaner
cf13739288 Add health and age load to pickup's. 2014-03-15 00:43:38 +01:00
Howaner
28898f710b Add ExpOrb saving. 2014-03-15 00:32:49 +01:00
madmaxoft
f2df33f746 Merge remote-tracking branch 'xdot/master' 2014-03-12 14:42:04 +01:00
madmaxoft
392fb7923b Merge remote-tracking branch 'origin/SnowBall' 2014-03-12 08:41:33 +01:00
andrew
9810d57a39 Unified Matrix4 code 2014-03-11 18:33:31 +02:00
STRWarrior
ef3c5a97a4 TakeDamage now has the cThrownSnowballEntity instead of the creator's object. 2014-03-11 16:24:05 +01:00
STRWarrior
deafec874d Snowballs now actualy hurt other entities.
3 damage for blazes and 1 for the ender dragon. Otherwise 0
2014-03-11 15:14:47 +01:00
andrew
b4bf13aa4f Unified Vector classes 2014-03-11 16:02:25 +02:00
Tiger Wang
e672988577 Merge remote-tracking branch 'origin/master' into awesometnt
Conflicts:
	src/Items/ItemLighter.h
	src/Simulator/IncrementalRedstoneSimulator.cpp
2014-03-10 18:59:11 +00:00
Tiger Wang
cc2d805238 Merge branch 'master' into awesometnt 2014-03-10 18:36:55 +00:00
Tiger Wang
09c5542123 Merge pull request #768 from Howaner/BlockEntitys
Add TNT load/save
2014-03-09 21:44:32 +00:00
Tiger Wang
1985a9c33e Merge pull request #731 from mc-server/ballisticmissiles
Ballistic firework missiles
2014-03-09 21:43:15 +00:00
Tiger Wang
3aff0b44bc Fixed #778 - stack overflow.com 2014-03-09 17:51:02 +00:00
Tiger Wang
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
Tiger Wang
c2978a3457 Merge branch 'master' into ballisticmissiles
Conflicts:
	src/ClientHandle.cpp
2014-03-09 12:53:50 +00:00