flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
10,770 Commits 1 Branch 0 Tags 92 MiB
c9a9b3c9d0
Commit Graph

549 Commits

Author SHA1 Message Date
Masy98
c836b52dd1 Added Entity Guardian 2014-12-18 19:30:32 +01:00
Howaner
c2926f8de1 derp 2014-12-17 20:08:55 +01:00
Howaner
fff108f20a Added comment. 2014-12-17 19:16:35 +01:00
Howaner
5c99f3fada Fixed eMonsterType lua bugs. 2014-12-17 17:28:24 +01:00
Tiger Wang
3acdf25b05 Merge remote-tracking branch 'origin/master' into c++11 
Conflicts:
	src/OSSupport/Thread.cpp
 2014-12-06 17:41:48 +00:00
Mattes D
e2a04f580a BasicStyle: Added missing braces to control statements. 2014-12-05 16:59:11 +01:00
Mattes D
44644ae025 Fixed reported parentheses around comparisons. 2014-12-05 12:58:47 +01:00
Mattes D
c014f5624c Merged branch 'origin/master' into c++11. 2014-12-04 22:04:16 +01:00
p-mcgowan
27185dd374 clearing CheckBasicStyle.lua messages 2014-12-03 00:26:15 -08:00
Howaner
bcbd73f7d8 MobSpawner fixes. 2014-12-01 14:58:13 +01:00
Howaner
677dde51bd Merge branch 'master' into MobSpawner 
Conflicts:
	MCServer/Plugins/APIDump/APIDesc.lua
 2014-12-01 14:43:03 +01:00
Howaner
c173bf61ad Removed old StringToMobType() function from Monster.cpp 2014-11-30 02:29:17 +01:00
Howaner
c673eb590f Mark StringToMobType() as deprecated. Use cMonster:StringToMobType() instead 2014-11-29 15:40:38 +01:00
Howaner
2478e290f9 Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes. 2014-11-29 15:20:44 +01:00
Howaner
648fee1a08 Merge branch 'master' into MobSpawner 2014-11-29 12:05:35 +01:00
Tiger Wang
187bdab4fa Merge remote-tracking branch 'origin-master' into c++11 2014-11-25 23:03:33 +00:00
Tiger Wang
79e5b82354 Merge remote-tracking branch 'origin/master' into c++11 
Conflicts:
	src/Noise/Noise.h
	src/World.h
 2014-11-23 17:12:34 +00:00
Mattes D
e9797c6a2a Merge remote-tracking branch 'origin/master' into GeneratorShapeRefactor 2014-11-23 12:33:04 +01:00
p-mcgowan
7a08c05787 formatting - newline at EOF inserted: Pig.cpp 2014-11-22 15:48:05 -08:00
p-mcgowan
d1b7a965d1 pigs turn into pigmen on lightning 2014-11-22 15:33:34 -08:00
p-mcgowan
793b1012c4 formatter error 2014-11-21 23:58:35 -08:00
p-mcgowan
635e9321c6 villagers turn into witches on lightning 2014-11-21 23:36:35 -08:00
p-mcgowan
ac2e3ede1d villagers turn into witches when struck by lightning 2014-11-21 23:20:44 -08:00
Howaner
42120e2ea5 Merge branch 'master' into MobSpawner 
Conflicts:
	MCServer/Plugins/Core
 2014-11-18 14:56:32 +01:00
Mattes D
1240e583d2 Mobs: Fixed crash with terrain too high. 2014-11-15 21:45:57 +01:00
Mattes D
f8c54f4243 Merged branch 'master' into c++11. 2014-10-23 08:40:39 +02:00
Tiger Wang
a26541a7c3 En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Tiger Wang
987f79afdd En masse NULL -> nullptr replace 2014-10-20 21:55:07 +01:00
Tiger Wang
aa19a3afb0 Migrated random generators to std::random 2014-10-19 14:10:18 +01:00
Steven Riehl
856764dee8 convert old style casts to fix warnings 2014-10-11 20:39:55 -06:00
madmaxoft
c94e82980e Fixed a missed value. 2014-10-05 22:56:56 +02:00
madmaxoft
112fac5798 Removed obsolete cMonster::eType. 
Has been replaced with global eMonsterType.
 2014-10-05 22:12:25 +02:00
madmaxoft
77c5b410e6 Fixed eMonsterType Lua API mismatch. 2014-10-05 22:09:19 +02:00
Jonathan Frederick
c02711633d Derp 2014-09-28 19:27:53 -07:00
Jonathan Frederick
7a61e1e604 Fix comments 2014-09-28 19:24:47 -07:00
Jonathan Frederick
126b14aa09 Make endermen take damage in water 2014-09-28 13:56:41 -07:00
madmaxoft
e7de548c89 Fixed minor style issues. 2014-09-27 21:37:36 +02:00
Howaner
033d16babb Merge branch 'master' into MobSpawner 
Conflicts:
	src/MobSpawner.h
	src/Mobs/Monster.h
 2014-09-26 23:56:20 +02:00
Mattes D
2c5b0f2378 Merge pull request #1415 from Masy98/blocks 
Added 1.8 Blocks and Items
 2014-09-26 22:24:45 +02:00
Tycho
a3f940f47c Removed more unessicary includes 2014-09-26 18:13:19 +01:00
Masy98
2feee3b316 Merge branch 'master' into blocks 
Conflicts:
	src/Items/ItemHandler.cpp
	src/Simulator/IncrementalRedstoneSimulator.cpp
 2014-09-26 18:32:31 +02:00
worktycho
411c69b420 Merge pull request #1419 from mc-server/redstoneTests 
Added test mocking to IncrementalRedstoneSimulator
 2014-09-26 16:04:26 +01:00
Howaner
060ac500fc Fixed wrong Surrounding size 2014-09-25 19:19:30 +02:00
Tycho
799c96661d Fixed style 2014-09-25 15:45:39 +01:00
Tycho
9c459cbe50 Merge branch 'master' into redstoneTests 
Conflicts:
	src/Mobs/Monster.h
 2014-09-25 15:22:08 +01:00
Howaner
4b38e077cf Merge branch 'master' into EntityCustomName 
Conflicts:
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/World.cpp
	src/World.h
 2014-09-23 14:39:49 +02:00
Howaner
718eb227ab Implemented mob spawner. 2014-09-19 23:00:54 +02:00
Tycho
045d54e0e2 Merge branch 'master' into redstoneTests 
Conflicts:
	src/Blocks/ChunkInterface.h
 2014-09-17 18:47:33 +01:00
Tycho
6e7c0e33b5 Added first test to show the object can be created 2014-09-17 18:40:10 +01:00
Tiger Wang
fdabfd77e2 Improved cBlockHandler::DropBlock 2014-09-13 22:49:27 +01:00
Howaner
1223a24d3c Merge branch 'master' into Effects 2014-09-12 19:13:46 +02:00
Masy98
a01994389d Fixed mutton name in Sheep.cpp 2014-09-11 16:24:16 +02:00
archshift
e1206568ec Revert "Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etc" 
This reverts commit 472efa8174.

Apparently we don't support some of these features quite yet (darn you C++98!)
 2014-09-03 16:23:03 -07:00
archshift
472efa8174 Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etc 
Snow Golems must also be above 64Y to spawn snow (as of 1.8).
 2014-09-03 16:12:43 -07:00
madmaxoft
1cc65b6264 Fixed style and alpha-sorting. 2014-09-03 10:29:10 +02:00
archshift
34d6f0713e Added mutton, which sheep now drop when killed 2014-09-02 23:21:08 -07:00
Howaner
38e824dbcf Renamed SetWalkSpeed() to SetRelativeWalkSpeed() 2014-09-02 20:10:41 +02:00
Howaner
5c53608dd0 Added CustomName saving. 2014-09-02 19:34:58 +02:00
Howaner
079634d18c Added the new functions to APIDump. 2014-09-02 19:20:59 +02:00
Howaner
1bb4d79412 Added SetCustomName() to players. 2014-09-02 19:12:35 +02:00
Howaner
dfed6f94ca Added name tag 2014-09-01 21:05:45 +02:00
Howaner
7c4cb9a385 Added CustomName to cMonster. 2014-09-01 20:12:56 +02:00
Howaner
d7ee2245e8 Added SetWalkSpeed() to cMonster. 2014-08-30 12:44:54 +02:00
reiter
690e6cb6f8 Fixed mob burning. 
Fixes #1298
 2014-08-28 00:01:01 +02:00
madmaxoft
ff37192e94 BasicStyleCheck: Dividers are exactly 80 slashes. 2014-08-04 13:20:28 +02:00
Howaner
7bd414e9ed Merge branch 'master' into Monster 2014-08-04 12:11:38 +02:00
madmaxoft
1fa210c7f9 Refactored case-conversion functions. 
StrToLower() returns a modified copy of the string, InPlaceLowercase() modifies the string in-place.
 2014-08-04 11:30:20 +02:00
Howaner
e70077361d Changed /** to /* 2014-08-04 11:23:35 +02:00
Howaner
7bea90d6ca Fixed warnings 2014-08-04 01:35:25 +02:00
Howaner
0911072d27 Attempt to fix knockback and swimming. 2014-08-04 01:34:12 +02:00
madmaxoft
3136fc6246 Wolf uses UUID for owner. 
Fixes #1277.
 2014-08-03 22:04:52 +02:00
madmaxoft
98a13d97b3 Trailing whitespace fix. 2014-08-03 22:04:50 +02:00
Tiger Wang
c865fc8ca5 Improved endermen code a little 2014-08-01 22:15:32 +01:00
Tiger Wang
1094d91fba Merge pull request #1047 from mc-server/Enderman 
Enderman attacks a player if he's looking at him
 2014-07-31 22:20:05 +01:00
Tiger Wang
ffd6797fe1 Comment suggestions 2014-07-31 18:17:21 +01:00
STRWarrior
c4e6a14235 Added lighting code and added comments 2014-07-30 19:18:11 +02:00
STRWarrior
5daeba7e88 Removed lighting code in cEnderman::CheckEventSeePlayer 2014-07-30 13:59:47 +02:00
Tiger Wang
8811837aea Merge branch 'master' into portals 
Conflicts:
	src/World.h
 2014-07-29 15:27:19 +01:00
Howaner
ba36e79bc5 Merge branch 'master' into Inventory2 
Conflicts:
	src/BlockInfo.cpp
 2014-07-26 13:23:11 +02:00
archshift
4191be7ddb Removed redundant semicolons and re-added warning 2014-07-24 11:21:37 -07:00
Howaner
396739cc0f Fix item durability. 
Fixes #1181
 2014-07-23 16:32:09 +02:00
Tiger Wang
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
madmaxoft
93d29555e5 Style: Normalized to no spaces before closing parenthesis. 2014-07-21 17:40:43 +02:00
madmaxoft
6be79575fd Style: Normalized spaces after if, for and while. 2014-07-21 17:38:50 +02:00
archshift
ada88a5805 Monsters: Made IsUndead overridable by the respective mob classes 2014-07-19 14:35:35 -07:00
madmaxoft
00c524519e Fixed style: spaces after commas. 2014-07-19 14:53:41 +02:00
Mattes D
4293db5eae Merge pull request #1214 from mc-server/anti-glob 
CMake - Explicitly lists all source files
 2014-07-19 14:29:22 +02:00
archshift
041bfd5860 Fixed clamping issues 2014-07-19 01:40:29 -07:00
archshift
725d1fd1e2 Subdirs: Only add_library if not using MSVC 2014-07-18 17:41:43 -07:00
archshift
2f811fc6a2 Mobs/CMakeLists.txt: Replaced glob with list of files 2014-07-18 17:41:42 -07:00
madmaxoft
44a4a83292 Merge branch 'Entities' 2014-07-18 23:21:04 +02:00
madmaxoft
19d012c96e Fixed slime-related comments. 2014-07-18 23:20:42 +02:00
Tiger Wang
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
Howaner
509d3d3b62 Slime sizes are 1, 2 or 4 and not 1, 2 or 3. 2014-07-18 16:55:28 +02:00
Tiger Wang
f1be1eb674 Monster fixes 
* Fixes #1203
* Fixes #627
 2014-07-18 10:47:00 +01:00
madmaxoft
2df5e26d3b Fixed spaces before commas. 2014-07-18 09:57:34 +02:00
Howaner
33bd78dcdd Skeletons should spawn with a bow in the hand. 
Fixes #1184
 2014-07-18 01:26:27 +02:00
Howaner
fba93aac2a Split into more lines. 2014-07-17 23:32:01 +02:00
madmaxoft
c03161f75d Fixed tabs used for alignment. 2014-07-17 23:16:55 +02:00
madmaxoft
d0cc9aedb3 More trailing whitespace fixes. 2014-07-17 23:16:54 +02:00
madmaxoft
5e198c6730 Basic style fixes. 2014-07-17 22:50:58 +02:00
Howaner
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
madmaxoft
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
madmaxoft
7d0fc85d00 Merge branch 'master' into potions 2014-07-17 11:01:26 +02:00
Mattes D
98244e96d1 Merge pull request #1193 from mc-server/deathmessages 
Death messages
 2014-07-17 10:12:22 +02:00
Tiger Wang
2189f37c20 Resolved backwards compatibility issues 2014-07-16 11:38:52 +01:00
madmaxoft
8e946da8ac Merge branch 'master' into potions 2014-07-15 09:01:32 +02:00
Howaner
9b0b57bcbc Update. 2014-07-13 11:11:40 +02:00
Howaner
e48d172f49 Merge branch 'master' into Sounds 2014-07-13 11:09:19 +02:00
Howaner
d529971e27 Changed BroadcastSoundEffect function to take floating pos. 2014-07-13 02:08:02 +02:00
Howaner
dc5c43c0aa Changed comments. 2014-07-13 01:04:43 +02:00
Howaner
4b093972ea Merge branch 'master' into Sheep 2014-07-13 00:54:11 +02:00
archshift
4e6395d6ff For now, removed creator member from Entity Effect for pointer safety 2014-07-11 17:27:29 -07: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
372dbbb994 Merge pull request #1135 from mc-server/fixes 
Fixes to projectiles and the undead
 2014-07-09 09:50:38 +01:00
madmaxoft
66fa015534 Fixed slime handling in cMonster::StringToMobType(). 2014-07-06 13:37:28 +02:00
Tiger Wang
460d6bd0cb Changed everything to callbacks 2014-07-05 22:59:22 +01:00
Tiger Wang
a0d2df9327 Tailored death messages 2014-07-04 10:55:09 +01:00
Howaner
68007ab3e5 Add doxy-comments. 2014-07-01 20:42:23 +02:00
worktycho
afda11a495 Changed comment 2014-06-30 19:33:10 +01:00
Howaner
c3cde6232f Moved the random code to a function (cSheep::GenerateNaturalRandomColor()) 2014-06-30 20:23:17 +02:00
Howaner
11d02a447e Save IsSheared from Sheep. 2014-06-28 13:19:32 +02:00
Howaner
bef84b4821 Fix sheep color's, add shear sound. 2014-06-28 12:59:09 +02:00
Mattes D
7102e9edb0 Merged branch 'tonibm19/master'. 2014-06-26 17:09:28 +02:00
Tiger Wang
dad0037f98 Bettered zombie and skeleton AI 
* Fixed potential issues with skylight detection
 2014-06-22 20:44:55 +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
1296c5dce7 More suggestions 2014-06-21 20:42:29 +01:00
tonibm19
3e15c92d18 Added pig riding. 
Now you can ride a pig using a carrot on a stick.
 2014-06-20 10:50:21 +02: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
worktycho
0690788cdf Replaced strange algebra with dot product. 
10 degrees is a completely arbitary constant I pulled from nowhere. Feel free to adjust this value.
 2014-06-17 20:36:47 -07:00
Tiger Wang
5d4f70a7a5 Improved Enderman code 2014-06-17 20:36:47 -07:00
STRWarrior
806130a967 Swapped m_Player and m_EndermanPos 2014-06-17 20:34:20 -07:00
STRWarrior
9f03682258 Enderman attacks a player if he's looking at him. 2014-06-17 20:34:20 -07:00
archshift
68c30790db Entity effects: changed User to Creator, removed pawn pass-by-value 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
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
2574573c88 Monster: added IsUndead(), undead-specific entity effects 2014-06-17 11:39:20 -07: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
Mattes D
af4a21ea06 Fixed deadlock when moving players to other worlds. 
Fixes #1039, fixes #851
 2014-06-08 21:58:30 +02:00
archshift
b768e54ce8 Fixed mob hitbox sizes, removed TODOs 
Measured bat and blaze in vanilla, updated values.
Cavespiders are, in fact, passive in the day.
 2014-06-07 00:40:01 -07:00
Tiger Wang
b73bf1a1e3 Fixed decision failure 2014-06-05 08:28:01 +01: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
Tiger Wang
9ef4b9d52d Exploded creepers drop nothing, part of #1058 2014-06-04 09:27:50 +01:00
STRWarrior
b9ca7bd120 Small tweak for mobs 
Mobs move a bit smoother and aren't able to move allot when in air.
 2014-06-02 14:16:36 +02:00
Tiger Wang
60a37c1370 Very minor code changes 2014-05-29 16:58:55 +01:00
andrew
7aeb8ce993 Fixed cWither::KilledBy 2014-05-21 10:59:14 +03:00
andrew
07baf9bdd3 Cleaned up cPlayer::UpdateMovementStats; Wither achievements 2014-05-20 15:52:59 +03:00
Mattes D
ac00568183 Merge pull request #998 from mc-server/StatManager 
Statistic Manager
 2014-05-18 22:30:34 +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
archshift
3f9e00a3f3 Fixed a few more switch warnings. 2014-05-11 16:28:48 -07: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
202ce3e737 Fixed MagmaCube spawning. 
Fixes #928.
 2014-05-02 19:17:22 +02:00
Mattes D
709015369d Merge pull request #940 from Howaner/GlobalFixes 
Add entity invulnerable
 2014-04-28 20:58:15 +02:00
Howaner
acd2804f31 Revert "Withers now use the new invulnerable." 
This reverts commit 619592b5a0.
 2014-04-28 13:51:40 +02:00
Howaner
26e935cb20 Revert "Changed the old invulnerable methods from the wither to the new." 
This reverts commit d50f8f6f11.
 2014-04-28 13:51:22 +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
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
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
477b3e7861 Moved cArrowEntity out of ProjectileEntity.h 2014-04-26 16:45:39 -07:00
archshift
e2194e6e90 Added static const, initialized fields. 2014-04-26 15:32:14 -07:00
archshift
aef2c8ec62 Further refactored, Reverted Minecart change 
Other small changes.
 2014-04-26 09:25:30 -07:00
Howaner
d50f8f6f11 Changed the old invulnerable methods from the wither to the new. 2014-04-26 17:47:25 +02:00
Howaner
619592b5a0 Withers now use the new invulnerable. 2014-04-26 17:37:35 +02:00
Howaner
49f6819829 Fixes 2014-04-26 16:44:15 +02:00
archshift
80b97fd9dd Fixed mobs that don't naturally spawn. 2014-04-25 20:49:55 -07:00
archshift
5ffdaa8142 Moved huge conditional out of InStateChasing(), improving readability 
Squashed a warning.
 2014-04-25 15:49:11 -07:00
Howaner
7e76f030aa Add entity invulnerable 2014-04-26 00:32:30 +02:00
archshift
d64e46186f Merge remote-tracking branch 'upstream/master' 2014-04-25 10:50:10 -07:00
archshift
e47dab84f3 Cmake generated projects for IDEs include headers in project files. 2014-04-25 09:56:15 -07:00
archshift
624deea6c4 Giants! 
Changed mfMaxplusone to mfUnhandled for readability, and fixed a default case warning.
 2014-04-24 18:11:11 -07:00
archshift
8fc45c5730 Fixed class capitalization for the cave spider. 2014-04-24 12:18:17 -07:00
archshift
06819595b0 Fixed references to renamed files. 2014-04-23 15:25:10 -07:00
archshift
c2f2ef7cb4 Rename mob source files to fit CamelCase. 
Rename Cavespider.cpp to CaveSpider.cpp

Rename Cavespider.h to CaveSpider.h

Rename Magmacube.cpp to MagmaCube.cpp

Rename Magmacube.h to MagmaCube.h

Rename Zombiepigman.cpp to ZombiePigman.cpp

Rename Zombiepigman.h to ZombiePigman.h
 2014-04-23 15:22:49 -07: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
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
Tiger Wang
19358fc7d5 Compilation fix 2014-04-18 20:20:00 +01: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
Tiger Wang
200ea6254c Fixed #904 2014-04-18 12:54:17 +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
Alexander Harkness
9ad87f670b Fixed GitHuB WebEdit fail. 2014-04-10 15:52:00 +01:00
Alexander Harkness
2d02ff1df8 Update Monster.cpp 2014-04-10 15:50:43 +01:00
Mattes D
e7b8e17746 Merge pull request #849 from mc-server/minorfixes 
Minor fixes
 2014-04-02 21:26:45 +02:00
Tycho
b449ad8613 Merge branch 'MacFixes' 
Conflicts:
	src/DeadlockDetect.cpp
	src/World.cpp
 2014-04-02 06:54:57 -07:00
Tiger Wang
ef48b30baa Final realisation of suggestions 2014-03-31 22:37:05 +01:00
Tiger Wang
0836fe9a84 Fixed a few Y too high/low asserts 2014-03-31 20:33:33 +01: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
andrew
c8445cd934 Fixed clang compilation 2014-03-25 11:40:54 +02:00
andrew
ba42166411 Fixed wither summoning 2014-03-25 11:13:27 +02:00
andrew
0fe1e50ffc Protocol: Wither metadata 2014-03-25 10:32:58 +02:00
andrew
4f3377bbbf Minor fixes 2014-03-25 09:10:55 +02:00
andrew
6b77dc74ad Wither invulnerability 2014-03-24 12:29:19 +02:00
madmaxoft
89027cb675 Fixed double to float conversions. 2014-03-16 22:00:28 +01:00
andrew
b4bf13aa4f Unified Vector classes 2014-03-11 16:02:25 +02:00
Tiger Wang
c2978a3457 Merge branch 'master' into ballisticmissiles 
Conflicts:
	src/ClientHandle.cpp
 2014-03-09 12:53:50 +00:00
andrew
070d483236 cBlockInfo now manages the respective cBlockHandler 2014-03-02 21:25:05 +02:00
Mattes D
b17d04737d Merge pull request #738 from xdot/master 
Refactored global block property arrays
 2014-03-02 16:13:43 +01:00
tonibm19
10fdc51b0a Creeper fixes 
- Fixed explosion time (1.5s, according to minecraftwiki)
- Creeper explodes if right clicked with flint and steel
 2014-03-02 14:35:03 +01:00
andrew
d73cdba1f6 g_BlockXXX => cBlockInfo::XXX 2014-03-01 21:34:19 +02:00
tonibm19
1de2c23d64 added mooshroom to cow conversion 2014-02-27 22:04:48 +01:00
Tiger Wang
a97f28939f Fixed sheep ASSERTing sometimes 2014-02-26 23:33:54 +00:00
Mattes D
23093fd4d1 Merge pull request #710 from TheJumper/master 
Fixed Mob Drops, Add Rare, Uncommon and Gear Drops, Looting inflicts Drops
 2014-02-24 18:30:44 +01:00
TheJumper
0b6aa7b370 Fixed Formatting, added compiler warning suppressing methods, fixed comments 2014-02-24 15:38:38 +01:00
TheJumper
2cc597372a Fixed Formatting, Added DropChances and CanPickUpLoot attributes to Monsters 2014-02-23 19:50:51 +01:00
Howaner
5e7f2ba6d6 Add Wolf Heal with Food 2014-02-20 20:41:53 +01:00
Alexander Harkness
72d312ac9b Merge pull request #690 from tonibm19/master 
Now mobs can't escape from fences.
 2014-02-17 16:12:59 +00:00
tonibm19
8707f7ddc8 Improved formatting 2014-02-17 17:01:22 +01:00
Alexander Harkness
d47e0b055b Merge pull request #692 from mc-server/wolfcleanup 
Wolf cleanup
 2014-02-17 10:21:38 +00:00
tonibm19
60bcf2807a Now mobs can't escape from fences. 2014-02-16 18:18:07 +01:00
Tiger Wang
2350b77bb5 Fixes to previous commit 2014-02-16 17:08:49 +00:00
Tiger Wang
1a84102b10 Slight cleanup of wolf code 2014-02-16 13:47:55 +00:00
Tiger Wang
8fbb936b63 Fixed TNT fizzing everywhere 2014-02-15 15:53:02 +00:00
Tiger Wang
7ced2f290f Simplified Attack() tracing 2014-02-12 21:53:21 +00:00
Tiger Wang
06239c8336 Fixed #627 
- Attack() is now called from cAggressive instead of cMonster
* Monsters can no longer attack through walls
* Should fix last remnants of player damage after teleporting (that both
STR and bearbin contributed fixes to :P)
 2014-02-11 22:09:56 +00:00
Tiger Wang
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
Tiger Wang
f86f066615 Merge branch 'master' into playerimprovements 
Conflicts:
	MCServer/Plugins/APIDump/APIDesc.lua
 2014-02-09 00:04:42 +00:00
Alexander Harkness
b9aa0420a3 Merge pull request #646 from worktycho/warningfixes 
Fixed most of the reordering warnings
 2014-02-05 18:24:08 +00:00
Tycho
8ba6f73169 Fixed most of the reordering warnings 2014-02-05 09:43:49 -08:00
Tiger Wang
630507fd5b Fixed a bunch of MSVS warnings 
* Possibly also fixed some bugs with pathfinding and TNT, though
unlikely
 2014-02-04 23:07:22 +00:00
Mattes D
0ceb0ef607 Merge pull request #635 from tonibm19/master 
Exported Item:IsEnchantable and Monster:MoveToPosition to Lua API
 2014-02-04 09:23:03 -08:00
tonibm19
a845b9abbb Blank lines and indentation. 
Also removed GetClosestPlayer documentation
 2014-02-04 17:29:36 +01:00
Tycho
80807eec2c Increased Type safety of Biomes 
Changed a number of funcictions from using integers to store biomes to using EMCSBiome
Note that switching from an int to an Enum is a non-breaking chang to the lua bindings
 2014-02-03 12:26:17 -08:00
tonibm19
c2e7dd34d9 Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua API 2014-02-03 20:52:11 +01:00
Tycho
0b0aa5554f Merge branch 'master' into GeneratingBenchmark2 
Conflicts:
	src/Blocks/BlockTorch.h
 2014-02-02 06:56:07 -08:00
Tycho
b82fc394dd Changed Signiture of OnUpdate 2014-02-02 06:49:37 -08:00
Kirill Kirilenko
2a52b390c0 Monster's nominal speed was increased. 2014-02-01 20:38:53 +04:00
Kirill Kirilenko
0d33f2d11d Fixed teleport to air, if owner is flying. 2014-02-01 20:22:12 +04:00
tonibm19
e9c1d1ea9c Did what xoft said 2014-01-29 20:02:41 +01:00
tonibm19
1c1832b6ce Rewritten code. 
Implemented xoft suggestion.
Using MoveToPosition as tigerw suggested.
 2014-01-29 19:15:26 +01:00
tonibm19
ba4865f7ee Fixed sheep 2014-01-29 18:32:46 +01:00
tonibm19
73d9a285d5 Fixed a copypasta error... 2014-01-29 18:25:10 +01:00
tonibm19
ebe0f9372f Now mobs follow you when holding their breed item 2014-01-29 18:08:33 +01:00
STRWarrior
8ca98e0c0e Renamed Farmer functions and added doxycomments 2014-01-28 16:26:44 +01:00
STRWarrior
b2bacf3a25 Villager: NoCountDown and Action function don't check VillagersShouldHarvestCrops anymore because it shoudn't even be activated anywhere. 2014-01-28 15:40:13 +01:00
STRWarrior
807a4dba98 Villager doesn't check the environment for crops if it doesn't need to. 2014-01-27 22:04:24 +01:00
STRWarrior
babc80ed77 The world can now be configured wether farmers should be able to harvest crops. 2014-01-27 22:02:19 +01:00
STRWarrior
8bf9043f98 Villager: Few more comments. 2014-01-27 21:39:00 +01:00
STRWarrior
33ad2761a0 Cleanup 
Most code in Tick is now split up in different functions.
 2014-01-27 21:34:22 +01:00
STRWarrior
723bb78dd1 Villagers: Harvesting is more rare. 2014-01-27 20:52:42 +01:00
STRWarrior
5b983b72fa Villager: Farmers can't place crops on blocks other then farmland. 2014-01-27 20:44:18 +01:00
STRWarrior
9cf006ecea Fixed compiler error. 2014-01-27 19:06:50 +01:00
STRWarrior
3dbe6c6de9 Villager: Farmer: Crops finding is more random. 2014-01-27 18:58:09 +01:00
STRWarrior
9807056a9c Added GetCropsPos and DidFindCrops functions. 2014-01-27 18:33:57 +01:00
STRWarrior
06c3bc1ea5 Villagers: Farmers now replant the crops. 2014-01-27 18:27:57 +01:00
STRWarrior
2cdd8f1961 Villagers: Fixed only gettings the crops block when farming. 2014-01-27 17:30:18 +01:00
STRWarrior
ca12decaf6 Villagers don't look for new crops when they already found one. 
Slight cleanup.
 2014-01-27 17:20:39 +01:00
STRWarrior
969bf05a26 Villagers: Farmers can also harvest carrots and potatoes. 2014-01-27 15:44:55 +01:00
STRWarrior
ed95f4d81b Makes farmers farm crops. 2014-01-27 14:40:31 +01:00
Mattes D
1f4e12c50c Merge pull request #590 from mc-server/Wolf_Fix 
Wolf: Small fix since the new AI and a new small feature.
 2014-01-26 04:40:16 -08:00
STRWarrior
4c780e7b44 Fixed bug where wolfs would teleport while they were sitting. 2014-01-26 13:27:35 +01:00
STRWarrior
a533386144 Small fix since the new AI and a new small feature. 
You get particles when trying to tame wolfs.
They don't walk anymore when they are sitting.
 2014-01-26 13:07:21 +01:00
Tiger Wang
70113b5730 Fixed segmentation fault on villager damage 
It occurred when attack was environmental.
 2014-01-26 00:14:00 +00:00
Mattes D
5749b40422 Merge pull request #588 from mc-server/Sheep_Eating 
Implemented sheeps eating grass.
 2014-01-25 13:36:47 -08:00
Mattes D
cdcad2237a Merge pull request #587 from mc-server/mobimprovements 
Mob improvements & rudimentary artificial intelligence
 2014-01-25 13:36:32 -08:00
Tiger Wang
cdd6478cea Did what xoft recommended 2014-01-25 21:29:27 +00:00
STRWarrior
7b8dc01db3 Implemented sheeps eating grass. 2014-01-25 21:19:52 +01:00
Tiger Wang
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
Tiger Wang
60b7f5f23d Attack() is no longer always called 2014-01-25 19:00:50 +00:00
Tiger Wang
314fc3cdac Mob bugfixes 
* Mobs no longer require constant line-of-sight to a player to remain
aggravated
* Fixed an ASSERT
* Fixed mobs jumping
* Fixed Idle state not properly using AI
+ Added FILE_IO_PREFIX to favicon loading
+ Implemented #563
 2014-01-25 14:42:26 +00:00
Tiger Wang
fd7fc7e59e All mobs now drown (fixes #54) 
* Implemented mob drowning
* Iron Golems and squids are excluded
 2014-01-24 23:58:51 +00:00
Tiger Wang
1112f5adc6 Fixed a generator bug 2014-01-24 23:56:19 +00:00
Tiger Wang
b367a74d3e Zombies and skeletons use AI 2014-01-24 23:56:05 +00:00
Tiger Wang
a988063915 Miscellaneous improvements 2014-01-24 21:55:04 +00:00
Tiger Wang
bf2af73899 Changed a condition to IsGameMode 2014-01-24 21:54:20 +00:00
madmaxoft
f0a75f7f73 Fixed a failure in cSquid. 
Probably due to rounding errors the squid was querying out-of-chunk coords.
 2014-01-24 22:23:57 +01:00
Tiger Wang
0583b9df39 Made wolves compatible with new AI code 2014-01-24 20:46:47 +00:00
Tiger Wang
1f82b6e192 Monsters no longer check for direct line of sight 2014-01-24 20:46:22 +00:00
Tiger Wang
9c0e3615ce Large reworking of mob code [SEE DESC] 
+ Implemented better pathfinding
- Removed lots of unused variables, functions, etc.
* Changed some variable types
* Other miscellaneous fixes, and also completes the previous PRs
 2014-01-24 19:57:32 +00:00
Tiger Wang
3e675f8c38 Implemented creeper abilities 
* Creepers now explode with a sound effect
* Creepers drop a music disc on the unlikely event of being killed by a
skeleton's arrow

Inspired by @maniak89's PR #132.
 2014-01-24 19:52:52 +00:00
Tiger Wang
74645fdfaa Removed obsoleted functions 2014-01-16 19:00:49 +00:00
madmaxoft
77aaa5c367 Merge branch 'fixes&features' of git://github.com/tonibm19/MCServer 2013-12-25 19:50:18 +01:00
Tiger Wang
548273c8f7 Preliminary mobile entity saving 
* Fixes #252
* Alleviates #380
+ Adds mob saving
* Fixed some debug !ASSERTs
 2013-12-25 16:07:52 +00:00
tonibm19
c6946fb8c4 Some fixes (SEE DESC) 
-Added missing mobs (wither, enderdragon and iron golem) to type to string list.
-Wither and iron golem can now spawn
 2013-12-23 10:32:49 +01:00
STRWarrior
5af74fe77c Fixed bug where snowgolems could replace non-solid blocks to snow blocks. 2013-12-22 21:12:34 +01:00
STRWarrior
5a9b26d322 Snow golems die in hot biomes and leave a snow trail. 2013-12-22 20:40:07 +01:00
STRWarrior
488d7ddd7d EnderDragons and SnowGolems are able to spawn. 2013-12-22 20:15:09 +01:00
Tycho Bickerstaff
779aca6051 Merge branch 'master' into cmake 2013-12-21 13:32:40 +00:00
madmaxoft
f5e6124ee0 Fixed the rest of constructor reorders. 2013-12-20 19:10:15 +01:00
madmaxoft
d6de11da07 Sorted a few constructors to remove warnings. 2013-12-20 16:39:20 +01:00
Tycho Bickerstaff
32e6be002d Merge branch 'master' into cmake 2013-12-20 15:33:04 +00:00
madmaxoft
8610d45ef1 Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). 2013-12-20 16:01:34 +01:00
STRWarrior
483ef89503 Fixed not getting XP from mobs. 2013-12-14 12:50:08 +01:00
Tycho Bickerstaff
ec5af4cffe moved mobs to globs 2013-12-10 23:07:30 +00:00
Tycho Bickerstaff
dd633d5a94 Merge branch 'master' into cmake 2013-12-10 23:01:35 +00:00
Tycho Bickerstaff
6cdc990884 more cmake 2013-12-10 21:39:20 +00:00
Alexander Harkness
0de95a215f Merge remote-tracking branch 'origin/master' into foldermove2 
Conflicts:
	VC2008/MCServer.vcproj
 2013-11-26 17:21:06 +00:00
Alexander Harkness
c3cd436ec3 Merge remote-tracking branch 'origin/master' into foldermove2 
Conflicts:
	GNUmakefile
 2013-11-24 14:37:03 +00:00
Alexander Harkness
675b4aa878 Moved source to src 2013-11-24 14:19:41 +00:00