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

118 Commits

Author SHA1 Message Date
Mattes D
2a9997881c Merge pull request #259 from tonibm19/patch-2 
Fixed horse saddle
 2013-10-18 07:29:23 -07:00
Mattes D
8bba2b02a1 Merge pull request #253 from SamJBarney/master 
Merge of Mob Spawning code by mgueydan
 2013-10-18 03:41:43 -07:00
tonibm19
2c187e53b7 Moved lines 
don't know if I did well
 2013-10-17 21:28:45 +02:00
tonibm19
90c39c55a9 More fixes 
- You can only tame horses with nothing at hand
- Fixed rearing
 2013-10-17 18:41:52 +02:00
tonibm19
137ed5a556 Improved horse saddling [SEE DESC] 
Now it checks if horse is already saddled, and if it's, you don't lose the saddle. Also, if the horse isn't tammed, you can't saddle it.
 2013-10-16 19:50:59 +02:00
madmaxoft
6a1149cf46 Fixed compilation errors. 2013-10-16 15:15:51 +02:00
tonibm19
2f8a0a8a3a Added extra line 2013-10-15 21:26:43 +02:00
tonibm19
4ee2632d4f Fixed saddle horse 2013-10-15 21:25:33 +02:00
tonibm19
400cab0b86 Fixed a big fail.I did 2013-10-15 18:17:17 +02:00
tonibm19
06b7e09e70 Added extra line (yes, again) 2013-10-15 17:32:15 +02:00
tonibm19
fbba2e79eb Added basic milk code. 2013-10-15 17:31:26 +02:00
tonibm19
7d4c0582a8 Added extra line 2013-10-15 17:11:42 +02:00
tonibm19
8147ccd13b Added horse saddling 
It uses pig code, sorry if it don't works, i'm a noob, but it should work.
 2013-10-15 17:09:43 +02:00
Samuel Barney
318d552248 Merge branch 'MobSpawning' of https://github.com/mgueydan/MCServer into MobSpawning 
Conflicts:
	source/Mobs/Bat.h
	source/Mobs/Monster.h
	source/World.cpp
 2013-10-14 10:03:47 -06:00
madmaxoft
e62cac07c0 Merge branch 'metadata' of git://github.com/tigerw/MCServer into tigerw-metadata. 2013-10-13 18:26:45 +02:00
Tiger Wang
d8d2f35e9d Eight round of fixes 
* Changed IsA() to *long if statement*
- Removed deprecated values in Entity.h - to blazes with the plugins!
* Renamed villager type enumerations to be LESS SHOUTY and more vt-y
+ Use vtMax for World.cpp testificate spawning
 2013-10-13 12:47:55 +01:00
Tiger Wang
327abdd10d Sixth round of fixes 
* Made horse rearing time fixed instead of random
 2013-10-11 21:33:56 +01:00
Tiger Wang
e2aaf202ab Fifth round of fixes 
* Enumerated Villager spawning
 2013-10-11 20:57:22 +01:00
Tiger Wang
ee2df34d03 Fourth round of fixes 
* Switchified WriteMobMetadata
* Renamed Horse functions to be better
 2013-10-11 01:00:16 +01:00
Tiger Wang
d7b2c534fd Third round of fixes 
* Split WriteMetadata into three functions for common, entity, and mob
* Edited a few mob sizes to Vanilla values
 2013-10-11 00:41:54 +01:00
Tiger Wang
fe6fa23a97 Second round of fixes 
* Implemented suggestions
 2013-10-09 21:02:59 +01:00
Tiger Wang
7401fc000d Initial round of fixes 
* Fixed intentional misspelling of baby! :D
* Better chested horse bool name
* Fixed some weird continuity issues with my recent changes not being
pushed up initially
* Fixed derpy hexadecimal values
 2013-10-08 22:21:55 +01:00
Tiger Wang
5db6213f34 Initial Metadata Commit [SEE DESC] 
+ Pigs, Minecarts, Sheep, Skeletons, Slimes, Villagers, Wolves, and
Horses have metadata
+ Base code on taming wolves, shearing sheep, and taming horses
+ Sheep and horses have different colours when spawned
 2013-10-08 19:20:49 +01:00
madmaxoft
c7fe42be26 Linux compilation fix #2. 2013-09-21 11:15:53 +02:00
madmaxoft
ea0addc2b9 Fixed Linux compilation. 2013-09-21 11:10:35 +02:00
madmaxoft
f3d0cdc9bc Fixed compilation from previous commit. 2013-09-21 11:05:44 +02:00
Tiger Wang
ecf40e2893 Fixed new monster aggressiveness issue 2013-09-19 21:20:21 +01:00
Tiger Wang
3e698d7b72 Added moar mobs! 
+ Added dragons
+ Added golems
+ Added giants
+ Added horses
+ Added some missing items
+ Added missing spawn egg metas
 2013-09-18 22:17:43 +01:00
Tiger Wang
f2b7b220a4 Fixed undead burning 
(c'mon xoft, test ya code :P)
 2013-09-17 20:57:35 +01:00
madmaxoft
9f7b2e259d Exported cMonster:GetMobType() to the Lua API. 2013-09-16 11:42:20 +02:00
tonibm19
973753774e Added an extra line. 
In first commit it says I removed first line
 2013-09-13 20:06:42 +02:00
tonibm19
b703d9c83b Fixed mobs attack range being too long 
It was set to 5, I think 2 is better because now mobs can kill you when there is a block (or 2) between you and monster.
 2013-09-13 19:33:22 +02:00
mgueydan
f12ac6b995 Inside cMonster::getMobFamily() : replacing Polymorphism by Map, in order to remove redundancy 2013-09-10 15:09:45 +02:00
mgueydan
bf4781d0ee Changing Bat to AMbiant creature 2013-09-10 14:26:27 +02:00
mgueydan
caa54af546 Implementing the MobSpawner (not used yet) that contains spawning rules 2013-09-08 01:21:43 +02:00
mgueydan
e844612503 Adding a getType in Monster that return an enum instead of an int or char 2013-09-07 21:03:01 +02:00
mgueydan
2361a5dc41 relockating mobs includes (they probably will end somewhere else in order not to recompile world each time you update a mob) 2013-09-07 20:07:56 +02:00
mgueydan
1e02e04d2c Adding Family for monsters : Hostile/Passive/Water/Ambient 2013-09-07 20:02:50 +02:00
madmaxoft
5f8a46373d Fixed a missing initialization in cMonster. 
This should fix commit ff762a7ece 's all-mobs burning.
 2013-09-07 16:42:34 +02:00
madmaxoft
ff762a7ece Moved daylight burning directly into cMonster. 2013-09-05 22:40:08 +02:00
Tiger Wang
fa7def847b Zomb-ee and Skellingtons burning improvements 
They don't burn unless they are in direct view of the sun god or are
protected by the sands of the souls of the underworld.
 2013-08-27 21:11:00 +01:00
madmaxoft
1a7912744f Moved entities into the Entities subfolder. 2013-08-19 11:39:13 +02:00
madmaxoft
0cb00996de Replaced E_ENTITY_TYPE_XXX with cMonster::mtXXX. 
Also slightly improved the spawning algorithm.
 2013-08-16 10:48:30 +02:00
madmaxoft
72e2891017 Fixed squid crashing the server when above or below the world 2013-08-10 08:22:53 +02:00
Alexander Harkness
53e22b1185 Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
madmaxoft@gmail.com
254295b5b8 Squid: fixed a possible crash caused by access to a wrong chunk 
Fixes FS #411.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1665 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-07 20:20:18 +00:00
madmaxoft@gmail.com
37276a4430 Rewritten entity-on-fire management ("forever on fire" bugs) 
Fixes FS #297 and part of FS #403.
Added sizes to all entities.
Moved all damage-related functions from cPawn to cEntity
API change: renamed cPawn:TeleportTo() to cEntity:TeleportToCoords()

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1635 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-01 10:39:56 +00:00
madmaxoft@gmail.com
4fe7801cfc Unified the way mobs are spawned (egg vs natural). Fixed deadlocks in mob moving. Fixed mob destroying code. 
Should fix FS #400 and partially fix FS #381

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1626 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-25 06:36:59 +00:00
keyboard.osh@gmail.com
de03dd6460 Moved physics to the cEntity class from the derivative classes (cMonster, cPickup). Added physics override to cPlayer to disable physics calculations. Fixed bug with pitch calculations on mobs. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1400 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-04-22 07:18:03 +00:00
madmaxoft@gmail.com
a49c004278 Rewritten entities so that they are owned by individual chunks and ticked within their chunk's Tick() 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1385 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-04-13 21:02:10 +00:00
keyboard.osh@gmail.com
8f047b0704 Added support for head yaw tracking and packet sending and fixed bug in BroadcastMovementUpdate 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1350 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-04-02 06:48:31 +00:00
keyboard.osh@gmail.com
b32a60106f Added helper functions AddSpeed, AddSpeedX, AddSpeedY, AddSpeedZ, AddPosition, AddPosX, AddPosY, AddPosZ. Made sure that all entites use these helper functions. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1299 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-03-23 04:33:47 +00:00
keyboard.osh@gmail.com
39e4bd3239 Implemented BroadcastMovementUpdate function. Moved m_Pos,m_Rot,m_Speed to private members and made sure that all classes uses the public functions to access these members. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1294 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-03-22 06:33:10 +00:00
madmaxoft@gmail.com
7593707713 Pickups are now being saved into Anvil. 
Also changed cEntity rotation datatype to double

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1262 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-03-09 14:35:43 +00:00
madmaxoft@gmail.com
4ce0c5a983 Moved the Speed member into cEntity class instead of its descendants. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1222 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-02-21 21:55:36 +00:00
madmaxoft@gmail.com
32ee4aaf1e Removed all E_ITEM_ symbols equivalent to E_BLOCK_, and all obsolete item and block symbols. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1218 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-02-16 11:12:56 +00:00
madmaxoft@gmail.com
b29af701b9 MTRand reference is now passed as a Tick() parameter so that it isn't created and destroyed over and over again. All entities will handle physics (empty callback for now) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1096 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-12-22 10:15:53 +00:00
madmaxoft@gmail.com
aebe130299 Reduced most mobs' constructors to oneliners by passing parameters to superclasses 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1095 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-12-22 09:39:13 +00:00
luksor111@gmail.com
994b02f5af Added sounds to levers and mobs 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1093 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-12-21 18:05:34 +00:00
madmaxoft@gmail.com
afaf104b40 Added more constants into eEntityType; made them a compulsory parameter to the constructor, so that all entities have proper type. 
Also added a few utility functions to cEntity for distinguishing the types (IsPlayer(), IsPickup() etc.)

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1092 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-12-21 12:52:14 +00:00
madmaxoft@gmail.com
033af999ba Reworked the IsA() / GetClass() framework to actually be useful. Added GetParentClass(). 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1090 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-12-21 12:21:20 +00:00
madmaxoft@gmail.com
912a1e7adc Refactored the TakeDamage API to take equipped weapon and armor into consideration (PvP untested) 
http://forum.mc-server.org/showthread.php?tid=625

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1087 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-12-21 11:04:08 +00:00
madmaxoft@gmail.com
4cebaa99f8 Refactored the world time. 
Now it is stored in two values - WorldAge (only incremented, plugins cannot change) and TimeOfDay (plugins can change). Since sub-tick precision is needed in Tick(), we store it both as number of seconds (double) and number of ticks (Int64) is calculated off of that.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1022 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-11-01 21:38:20 +00:00
luksor111@gmail.com
77064aa486 Added Bats and Witches. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1021 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-11-01 10:56:47 +00:00
madmaxoft@gmail.com
1b4b905f75 Added spawn eggs with mobs (patch committed by Luksor) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@979 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-10-19 18:30:46 +00:00
madmaxoft@gmail.com
770486d2e1 Removed a few debugging messages from the release builds. 
( http://forum.mc-server.org/showthread.php?tid=571 )

git-svn-id: http://mc-server.googlecode.com/svn/trunk@936 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-10-06 19:00:03 +00:00
madmaxoft@gmail.com
ecfe6ab65b Source files cleanup: The rest of the files renamed. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@887 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-09-23 22:09:57 +00:00
madmaxoft@gmail.com
16f44ab7de Source files cleanup: Mobs-related files in a separate subfolder, renamed. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@883 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-09-23 20:53:08 +00:00