6180f7df09
Fixed style
2014-08-31 11:28:42 +02:00
4900645b28
Added a_Digger check
2014-08-30 00:27:33 +02:00
7d771953c0
More Enchantments
...
- Added Thorns and Respiration enchantments
2014-08-22 11:49:49 +02:00
19d1c976e7
Protection Enchantments, some fixes
...
- Protection echantments (fire, blast, feather falling, protection and
projectile). It isn't finished, add secondary effects and optimize the
code.
- Removed some brackets.
- Silk touch fixed.
2014-08-21 12:08:38 +02:00
5008eb8c83
Changed if in BlockHandler
2014-08-19 18:40:42 +02:00
07350de514
Changed if for switch
2014-08-19 16:47:33 +02:00
1897f678f9
Added more enchantments and some fixes
...
- Removed Debug messages
- Added Punch enchantment effect
- Added Silk Touch enchantment
- Added Unbreaking enchantment effect
2014-08-19 16:08:17 +02:00
d3fd63c9eb
Added some Enchantments
...
- Bow enchantments: Infinity, Flame and Power
- Sword and tools enchantments: Fire Aspect, Bane of Arthropods, Smite,
Sharpness
2014-08-19 12:38:15 +02:00
0911072d27
Attempt to fix knockback and swimming.
2014-08-04 01:34:12 +02:00
e461df0030
Entity.cpp: Air timer comment fix
2014-08-03 02:20:48 -07:00
9ecce2366e
Code reduction and clarity fixes
2014-08-02 22:35:29 -07:00
7915c4ca7c
Entity.cpp: On portal check, use if-else for current dimension
...
If current dimension corresponds with the portal (nether portal in the nether) send to the overworld, else send to the portal dimension. No need to switch on the dimension and exclude potential others.
2014-08-02 21:44:02 -07:00
cb77b39dc6
Detrailed whitespace
2014-07-29 16:36:24 +01:00
8811837aea
Merge branch 'master' into portals
...
Conflicts:
src/World.h
2014-07-29 15:27:19 +01: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
726312602d
Added m_TicksAlive to entities, allows projectiles to hit their creators
2014-07-20 01:43:07 -07:00
041bfd5860
Fixed clamping issues
2014-07-19 01:40:29 -07:00
44a4a83292
Merge branch 'Entities'
2014-07-18 23:21:04 +02: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
d0cc9aedb3
More trailing whitespace fixes.
2014-07-17 23:16:54 +02:00
5e198c6730
Basic style fixes.
2014-07-17 22:50:58 +02:00
52d4c49d5c
Fixed many slime bugs.
...
- Fixed slime hurt/death sound
- Added slime spawning on death.
- Fixed the max health.
- Fixed the attack damage.
- Little slimes should not attack players.
2014-07-17 22:32:23 +02:00
7a9f9ab744
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-07-17 22:23:08 +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
3dd9649665
Fixed mob knockback
...
* Fixes #901
2014-07-17 14:32:52 +01: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
2189f37c20
Resolved backwards compatibility issues
2014-07-16 11:38:52 +01:00
061010288a
Readability and clarity changes
2014-07-14 13:46:43 -07: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
372dbbb994
Merge pull request #1135 from mc-server/fixes
...
Fixes to projectiles and the undead
2014-07-09 09:50:38 +01:00
a0d2df9327
Tailored death messages
2014-07-04 10:55:09 +01:00
428cfb5c21
Suggestions
2014-06-29 22:41:31 +01:00
b6df30831d
Fixed server forcing players afloat
...
* Fixes #1131
2014-06-27 23:13:26 +01:00
4238b0ebe8
Some Entity.cpp style improvements
2014-06-22 20:44:18 +01:00
e709652257
Conforms to standards
2014-06-22 00:21:39 +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
6e681269d9
Fixed invalid iterators
2014-06-21 22:07:38 +01:00
1296c5dce7
More suggestions
2014-06-21 20:42:29 +01:00
814cdca054
Added wither damage type, wither entity effect.
2014-06-17 11:39:21 -07:00
5803094d7d
Entity: only fire critical hit if damage type is physical
2014-06-17 11:39:20 -07:00
ee50790398
Merge branch 'master' of github.com:mc-server/MCServer
2014-06-16 15:12:50 +01:00
8a80843ddf
Reverted portal creation code
...
It wasn't really working and needs more development
2014-06-14 10:18:16 +01:00
e10940d57c
Fixed compile
2014-06-12 17:24:14 +01: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
35b79e5d71
Portal improvements and suggestions
2014-06-10 20:43:27 +01:00
af4a21ea06
Fixed deadlock when moving players to other worlds.
...
Fixes #1039 , fixes #851
2014-06-08 21:58:30 +02:00
873043c8e4
Suggestions
2014-06-04 21:51:19 +01:00
ccbf6cc446
Configurable portals
2014-06-04 20:00:55 +01:00
01f38d8836
Added checks for no downfall biomes
2014-06-04 13:22:50 +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
f55f5ec47f
Merge branch 'master' into achievementtranslate
...
Conflicts:
src/Entities/Player.cpp
2014-05-24 23:21:39 +01:00
941cb88ae4
Fixed datatype conversion warning.
2014-05-23 12:33:30 +02:00
2bfe962e28
Fixed a cactus Y position issue
2014-05-19 22:15:39 +01:00
4008af6925
Simplified cacti conditions
2014-05-19 21:17:28 +01:00
1de4408a18
Merge pull request #1010 from mc-server/cactidamage
...
Implemented cacti damage
2014-05-19 14:01:50 +01:00
6de0257bbe
Derp
2014-05-19 13:31:19 +01:00
dc39d88d3f
Should have fixed assumptions about entity width.
...
@madmaxoft can you comment?
2014-05-19 10:35:21 +01:00
70cf4a5eaf
Fixed clanging errors.
...
Please @tigerw make sure this is correct.
2014-05-19 07:31:53 +01:00
6167c79e7a
Implemented cacti damage
...
+ Implemented cacti damage
* Fixed pickup tossing (PR #994 bug)
2014-05-18 22:41:42 +01:00
a651c865e4
There's no "round" function in MSVC2008.
2014-05-18 22:49:27 +02: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
1df7dbe7c9
Suggestions'd
2014-05-05 23:45:35 +01:00
839447f0bb
Merge branch 'master' into fixes.
2014-05-02 19:34:28 +02:00
709015369d
Merge pull request #940 from Howaner/GlobalFixes
...
Add entity invulnerable
2014-04-28 20:58:15 +02:00
9dc9713a9c
Fixed warnings.
2014-04-27 23:12:52 +02:00
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
e2194e6e90
Added static const, initialized fields.
2014-04-26 15:32:14 -07:00
da931da603
Merge pull request #941 from archshift/master
...
Fixed lots of warnings, and other small changes.
2014-04-26 23:26:59 +02:00
aef2c8ec62
Further refactored, Reverted Minecart change
...
Other small changes.
2014-04-26 09:25:30 -07:00
49f6819829
Fixes
2014-04-26 16:44:15 +02:00
acff6148b6
Moved switch{} out of GetArmorCoverAgainst().
2014-04-25 19:49:08 -07:00
7fd9fe9d5f
Merge branch 'master' into GlobalFixes
2014-04-26 00:34:42 +02:00
7e76f030aa
Add entity invulnerable
2014-04-26 00:32:30 +02:00
4cd2d57c64
Fix formatting
2014-04-25 12:06:22 +04:00
827c3760db
Fix for clang
2014-04-25 10:58:48 +04:00
a72744f5c3
Mobs shouldn't burn when it's Raining & Mob Knockback is far too much
2014-04-25 10:08:36 +04:00
c949c1e755
Implemented suggestions
2014-04-24 22:03:47 +01: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
103c867f1f
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-04-23 18:15:28 +04:00
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
8768669428
Renamed getter and setter for IsFireproof.
2014-04-23 00:12:37 -07:00
a37b36adab
Fireproof status getter and setter.
2014-04-22 12:59:31 -10:00
06f41699af
Fixed indentation and changed m_Fireproof to m_IsFireproof.
2014-04-22 02:36:39 -10:00
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
a967313839
Mobs shouldn't burn when it's Raining #906
2014-04-21 13:13:25 +04:00
6cb63a768d
Fixed #906
2014-04-18 12:59:14 +01:00
b7e074b10b
Merge pull request #891 from mc-server/fixes
...
Fixes to redstone & general
2014-04-17 22:37:00 +02:00
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
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
143a5e61fc
Fixed Endiannes conversion routines for floats and doubles.
...
This bug has been introduced in 8825d30aabfixes #854 .
2014-04-05 22:34:05 +02:00
a0720a65d6
Minor Entity.cpp cleanup
2014-03-19 23:07:16 +00:00
b8fe024f9d
Merge branch 'master' into awesometnt
...
Conflicts:
src/ChunkMap.cpp
2014-03-18 20:49:08 +00:00
9810d57a39
Unified Matrix4 code
2014-03-11 18:33:31 +02:00
53231bebd6
Added extra awesomeness to TNT
...
+ TNT now has a chance of flinging FallingBlock entities around
* Improved TNT damage
* Improved TNT spawning visuals
* Possible fix for 'SetSwimState failure' messages in debug
2014-03-05 22:12:48 +00:00
d73cdba1f6
g_BlockXXX => cBlockInfo::XXX
2014-03-01 21:34:19 +02:00
8ba6f73169
Fixed most of the reordering warnings
2014-02-05 09:43:49 -08:00
b89419f603
Creative players take Plugin damage
2014-02-02 12:47:17 +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
2ce26574ef
Removed unused ReferenceManager
2014-01-24 19:46:45 +00:00
b02940209d
Fixed crash with failed entity-loading.
...
This should fix issues reported in:
http://forum.mc-server.org/showthread.php?tid=1328
http://forum.mc-server.org/showthread.php?tid=1308
2014-01-24 09:57:12 +01:00
ed1d336614
Merge remote-tracking branch 'origin/customnames'
2014-01-17 10:44:23 +01:00
de4ac55398
Disabled excessive entity-related logging in Debug mode.
2014-01-16 20:31:06 +01:00
74645fdfaa
Removed obsoleted functions
2014-01-16 19:00:49 +00:00
a66e154b90
Final improvements to Minecarts
...
* Fixed curved rails being a little broken
+ Implemented detector rails
+ Implemented block collisions on rails
* Fixed snapping to rail
- Removed minecart physics conditions in Entity.cpp as minecarts use
their own simulator when on rails
Fixes #148 and #217 ; partially implemented #215 .
This is Cave Johnson, and we're done here.
2014-01-13 22:37:09 +00: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
ec6c510bd4
Multiple enhancements and fixes to minecarts
...
+ They are destroyed instantly by creative mode
* Physics is much improved
+ Basic implementation of powered rails
2014-01-12 13:28:37 +00:00
89f87f66a5
Improved knockback animation
...
* Critical hits now actually increase damage
* Looking down at an entity and hitting them still produces upwards
motion (as per Vanilla experience)
* Reduced force to be more realistic
2013-12-24 15:02:35 +00:00
d8221854d2
Fixed a comment in Entity.cpp
2013-12-23 09:41:45 +00:00
b02a81678c
Implemented knockback and critical hit
2013-12-22 20:04:17 +00:00
8570d08eb4
More reordering fixes.
2013-12-20 17:11:51 +01:00
d6de11da07
Sorted a few constructors to remove warnings.
2013-12-20 16:39:20 +01:00
8610d45ef1
Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT).
2013-12-20 16:01:34 +01:00
459d636948
Added HandleSpeedFromAttachee so an entity can override the function.
2013-12-16 18:02:33 +01:00
3712ee7b11
Fixed angle normalization typo.
2013-12-08 18:54:04 +01:00
6785bb7c16
Fixed normalizing large angles.
2013-12-08 13:08:56 +01:00
044fd237b6
Moved bindings-related to a Bindings subfolder.
...
Ref.: #407
2013-12-08 12:17:54 +01:00
675b4aa878
Moved source to src
2013-11-24 14:19:41 +00:00
Jaume Aloy
Howaner
archshift
Tiger Wang
madmaxoft
Tycho
worktycho
Alexander Harkness
andrew
r.ramazanov
STRWarrior