Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
Choose a Base Repository
cuberite/cuberite
36451/MCServer
4264/cuberite
Akheon23/cuberite
Alyxey/cuberite
Ba4life/cuberite
BrainShit/MCServer
C-Elegans/cuberite
ChriPiv/MCServer
Dam63/MCServer
DevToaster/MCServer
DjKiDD/MCServer
Erbelding/cuberite
ErrAza/MCServer
FX-Master/MCServer
Floppy012/MCServer
FullStackUnicorns/MCServer
GameClub2000/cuberite
HackerTon/MCServer
HaoTNN/cuberite
Haxi52/cuberite
HelenaKitty/EbooMC
Hillvith/MCServer
Hmaal/MCServer
Howaner/MCServer
Infinity-Codeur/MCServer
JABirchall/MCServer
JJOL/cuberite
JoeClacks/MCServer
JoseDiaz27/MCServer
Jothle12/MCServer
Kungfumoo/MCServer
Limb/MCServer
LinEvil/cuberite
MaxM357/MCServer
Motoburger1/MCServer
MuhammadWang/MCServer
Nerkyator/MCServer
Noraaron1/MCServer
Pheo/MCServer
PixeLInc/cuberite
PyroCybin/cuberite
Raekye/MCServer
RedEnraged96/MCServer-1
Redd-Dasan/cuberite
Renoh47/MCServer
Roro534/cuberite
SOSDAN/cuberite
SamMauldin/MCServer
Samvbnm/MCServer
Schwertspize/cuberite
Seadragon91/cuberite
Sentir101/MCServer
Solexid/MCServer
StefanNemeth/cuberite
Tank-D/MCServer
ThisIsAgent1k/MCServer
ThuGie/MCServer
TigerHix/MCServer
TonyMo/MCServer
Toyz/MCServer
Tri125/MCServer
UltraCoderRU/cuberite
WillEccles/cuberite
Xury/MCServer
Zeenjayli/MCServer
Zignixx/cuberite
acrade/cuberite
adesnos/cuberite
ameuret/cuberite
arekinath/MCServer
arnaudlahalle/cuberite
artemist/cuberite
axisd/MCServer
balika011/MCServer
bendl/cuberite
benhc123/MCServer
bibo38/Cuberite
birkett/cuberite
bowlofstew/MCServer
cacaxi/MCServer
carriercomm/cuberite
cedeel/MCServer
cheryl0047/MCServer
christopher-montagna/MCServer
codebucketdev/MCServer
coding12/cuberite
commshare/MCServer
crexalbo/MCServer
crosbymichael/MCServer
daemon777/MCServer
daniel0916/MCServer
darkzmii/cuberite
dave-tucker/cuberite
daveh86/MCServer
debug-stick/cuberal
deckerrj/cuberite
decterous/MCServer
default0/MCServer
dmonger/MCServer
dougvj/MCServer
electromatter/cuberite
ezhangle/cuberite
f0rb1d/MCServer
gdevillele/cuberite
geekpower14/MCServer
giriko/MCServer
greatman/MCServer
guijun/MCServer
gushromp/MCServer
hallucino/cuberite
hammermaps/MCServer
harryhare/MCServer
hide92795/cuberite
hmartinh/cuberite
ionux/MCServer
irrelevantdotcom/MCServer
jacky526/cuberite
jalons/MCServer
jamesliu96/MCServer
jamesmunns/MCServer
jamestait/cuberite
jamiepg1/MCServer
jammet/MCServer
jaumealoy/MCServer
jayr0flmc/cuberite
jimfinnis/MCServer
jimiy/cuberite
joeflezer/MCServer
john092/MCServer
josephcopenhaver/cuberite
joshi07/MCServer2
jpdamon/cuberite
kharashubham/cuberite
kjanku1/MCServer
lighth7015/cuberite
lima900/MCServer
linnemannr/MCServer
lkolbly/MCServer
lvshiling/MCServer
madtomic/MCServer
maki-chan/MCServer
maniak89/MCServer
marmot21/MCServer
martindev2/cuberite
marvinkopf/cuberite
meiavy/cuberite
mgueydan/MCServer
mhmd05/cuberite
mjhanninen/cuberite
mjssw/cuberite
mmdk95/cuberite
mrhabib/MCServer
narroo/MCServer
nathankot/MCServer
necrophcodr/cuberite
nesco/MCServer
nevercast/cuberite
nicodinh/cuberite
nounoursheureux/MCServer
p-mcgowan/MCServer
paizzj/cuberite
parlock/cuberite
patthekenny/MCServer
pillsbury7901/MCServer
planetx/MCServer
prabhjeet27/cuberite
psrivast7788/MCServer
ravenscroftj/MCServer
rcrimp/MCServer
rhamilton1415/cuberite
ricucremop/cuberite
ryansnewell/MCServer
scribblemaniac/cuberite
scriptsboy/cuberite
seijikun/MCServer
shaunstanislaus/MCServer
sircodes/MCServer
skarlitz/MCServer
soemthlng/cuberite
stpinker/MCServer
straemer/MCServer
thatchristoph/MCServer
then0rTh/cuberite
tomthoros/MCServer
tonetheman/MCServer
tt7truong/MCServer
ubiGG/cuberite
vyeluri5/MCServer
w00tc0d3/MCServer
waluoo/MCServer
wang108/MCServer
wnwkimo/cuberite
worktycho/MCServer
xanahopper/MCServer
yamamushi/MCServer
yinyunqiao/MCServer
yo4you/cuberite
zackp30/cuberite
zeliard/MCServer
Nothing to show
Choose a Head Repository
cuberite/cuberite
36451/MCServer
4264/cuberite
Akheon23/cuberite
Alyxey/cuberite
Ba4life/cuberite
BrainShit/MCServer
C-Elegans/cuberite
ChriPiv/MCServer
Dam63/MCServer
DevToaster/MCServer
DjKiDD/MCServer
Erbelding/cuberite
ErrAza/MCServer
FX-Master/MCServer
Floppy012/MCServer
FullStackUnicorns/MCServer
GameClub2000/cuberite
HackerTon/MCServer
HaoTNN/cuberite
Haxi52/cuberite
HelenaKitty/EbooMC
Hillvith/MCServer
Hmaal/MCServer
Howaner/MCServer
Infinity-Codeur/MCServer
JABirchall/MCServer
JJOL/cuberite
JoeClacks/MCServer
JoseDiaz27/MCServer
Jothle12/MCServer
Kungfumoo/MCServer
Limb/MCServer
LinEvil/cuberite
MaxM357/MCServer
Motoburger1/MCServer
MuhammadWang/MCServer
Nerkyator/MCServer
Noraaron1/MCServer
Pheo/MCServer
PixeLInc/cuberite
PyroCybin/cuberite
Raekye/MCServer
RedEnraged96/MCServer-1
Redd-Dasan/cuberite
Renoh47/MCServer
Roro534/cuberite
SOSDAN/cuberite
SamMauldin/MCServer
Samvbnm/MCServer
Schwertspize/cuberite
Seadragon91/cuberite
Sentir101/MCServer
Solexid/MCServer
StefanNemeth/cuberite
Tank-D/MCServer
ThisIsAgent1k/MCServer
ThuGie/MCServer
TigerHix/MCServer
TonyMo/MCServer
Toyz/MCServer
Tri125/MCServer
UltraCoderRU/cuberite
WillEccles/cuberite
Xury/MCServer
Zeenjayli/MCServer
Zignixx/cuberite
acrade/cuberite
adesnos/cuberite
ameuret/cuberite
arekinath/MCServer
arnaudlahalle/cuberite
artemist/cuberite
axisd/MCServer
balika011/MCServer
bendl/cuberite
benhc123/MCServer
bibo38/Cuberite
birkett/cuberite
bowlofstew/MCServer
cacaxi/MCServer
carriercomm/cuberite
cedeel/MCServer
cheryl0047/MCServer
christopher-montagna/MCServer
codebucketdev/MCServer
coding12/cuberite
commshare/MCServer
crexalbo/MCServer
crosbymichael/MCServer
daemon777/MCServer
daniel0916/MCServer
darkzmii/cuberite
dave-tucker/cuberite
daveh86/MCServer
debug-stick/cuberal
deckerrj/cuberite
decterous/MCServer
default0/MCServer
dmonger/MCServer
dougvj/MCServer
electromatter/cuberite
ezhangle/cuberite
f0rb1d/MCServer
gdevillele/cuberite
geekpower14/MCServer
giriko/MCServer
greatman/MCServer
guijun/MCServer
gushromp/MCServer
hallucino/cuberite
hammermaps/MCServer
harryhare/MCServer
hide92795/cuberite
hmartinh/cuberite
ionux/MCServer
irrelevantdotcom/MCServer
jacky526/cuberite
jalons/MCServer
jamesliu96/MCServer
jamesmunns/MCServer
jamestait/cuberite
jamiepg1/MCServer
jammet/MCServer
jaumealoy/MCServer
jayr0flmc/cuberite
jimfinnis/MCServer
jimiy/cuberite
joeflezer/MCServer
john092/MCServer
josephcopenhaver/cuberite
joshi07/MCServer2
jpdamon/cuberite
kharashubham/cuberite
kjanku1/MCServer
lighth7015/cuberite
lima900/MCServer
linnemannr/MCServer
lkolbly/MCServer
lvshiling/MCServer
madtomic/MCServer
maki-chan/MCServer
maniak89/MCServer
marmot21/MCServer
martindev2/cuberite
marvinkopf/cuberite
meiavy/cuberite
mgueydan/MCServer
mhmd05/cuberite
mjhanninen/cuberite
mjssw/cuberite
mmdk95/cuberite
mrhabib/MCServer
narroo/MCServer
nathankot/MCServer
necrophcodr/cuberite
nesco/MCServer
nevercast/cuberite
nicodinh/cuberite
nounoursheureux/MCServer
p-mcgowan/MCServer
paizzj/cuberite
parlock/cuberite
patthekenny/MCServer
pillsbury7901/MCServer
planetx/MCServer
prabhjeet27/cuberite
psrivast7788/MCServer
ravenscroftj/MCServer
rcrimp/MCServer
rhamilton1415/cuberite
ricucremop/cuberite
ryansnewell/MCServer
scribblemaniac/cuberite
scriptsboy/cuberite
seijikun/MCServer
shaunstanislaus/MCServer
sircodes/MCServer
skarlitz/MCServer
soemthlng/cuberite
stpinker/MCServer
straemer/MCServer
thatchristoph/MCServer
then0rTh/cuberite
tomthoros/MCServer
tonetheman/MCServer
tt7truong/MCServer
ubiGG/cuberite
vyeluri5/MCServer
w00tc0d3/MCServer
waluoo/MCServer
wang108/MCServer
wnwkimo/cuberite
worktycho/MCServer
xanahopper/MCServer
yamamushi/MCServer
yinyunqiao/MCServer
yo4you/cuberite
zackp30/cuberite
zeliard/MCServer
Nothing to show
Commits on Aug 28, 2014
Commits on Aug 30, 2014
Commits on Sep 01, 2014
Commits on Sep 02, 2014
Commits on Sep 03, 2014
Commits on Sep 04, 2014
Commits on Sep 07, 2014
Implemented packet compression.
ChunkData packet needs this.
Commits on Sep 08, 2014
Commits on Sep 09, 2014
Commits on Sep 10, 2014
Commits on Sep 11, 2014
Commits on Sep 12, 2014
Commits on Sep 13, 2014
Commits on Sep 14, 2014
Commits on Sep 15, 2014
Commits on Sep 16, 2014
Pre 1.8 release
Added Gamemode Spectator
Preparing 1.8 changes
Added Spectator Gamemode
Pre 1.8 release
Added Spectator gamemode
Preparing 1.8 update
Added Spectator gamemode
Preparing 1.8 update
Partially added Spectator gamemode
Commits on Sep 17, 2014
Commits on Sep 18, 2014
Commits on Sep 19, 2014
Commits on Sep 20, 2014
Commits on Sep 21, 2014
Commits on Sep 22, 2014
Commits on Sep 23, 2014
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
Merge pull request #1372 from mc-server/EntityCustomName
Added SetCustomName() to cMonster and cPlayer
Anvil: Wolf collar color is a byte in Vanilla.
Kept the old Int reading for compatibility reasons.
Ref.: #1448
Commits on Sep 24, 2014
Commits on Sep 25, 2014
HangingEntity: Silenced a crash.
Vanilla worlds sometimes contain data that this was asserting upon. Changed into a log.
Use the json writer to write sign texts.
Without this change the client disconnects if the text contains "
Merge branch 'master' into redstoneTests
Conflicts:
	src/Simulator/IncrementalRedstoneSimulator.cpp
Protocol 1.8: Handling packet compression properly.
The compression didn't work with CommLog turned on.
cByteBuffer: Simplified ReadPosition().
Also, by popular demand, added more comments to the code.
Commits on Sep 26, 2014
Commits on Sep 27, 2014
Showing with 12,986 additions and 6,609 deletions.
  1. +1 −1 .gitmodules
  2. +1 −0 CONTRIBUTORS
  3. +11 −0 MCServer/Plugins/APIDump/APIDesc.lua
  4. +3 −2 MCServer/Plugins/APIDump/Hooks/OnSpawningEntity.lua
  5. +1 −1 MCServer/Plugins/Core
  6. +17 −1 MCServer/Plugins/Debuggers/Debuggers.lua
  7. +1 −0 MCServer/crafting.txt
  8. +9 −3 MCServer/items.ini
  9. +603 −0 MCServer/lang/items_de.ini
  10. +0 −209 Nightbuild2008.cmd
  11. +4 −4 README.md
  12. +1 −0 Tools/.gitignore
  13. +0 −4 Tools/BiomeVisualiser/.gitignore
  14. +0 −338 Tools/BiomeVisualiser/BiomeCache.cpp
  15. +0 −96 Tools/BiomeVisualiser/BiomeCache.h
  16. +0 −114 Tools/BiomeVisualiser/BiomeColors.cpp
  17. +0 −15 Tools/BiomeVisualiser/BiomeColors.h
  18. +0 −119 Tools/BiomeVisualiser/BiomeRenderer.cpp
  19. +0 −55 Tools/BiomeVisualiser/BiomeRenderer.h
  20. +0 −37 Tools/BiomeVisualiser/BiomeSource.h
  21. +0 −247 Tools/BiomeVisualiser/BiomeViewWnd.cpp
  22. +0 −69 Tools/BiomeVisualiser/BiomeViewWnd.h
  23. +0 −52 Tools/BiomeVisualiser/BiomeVisualiser.cpp
  24. +0 −31 Tools/BiomeVisualiser/BiomeVisualiser.h
  25. +0 −23 Tools/BiomeVisualiser/BiomeVisualiser.sln
  26. +0 −527 Tools/BiomeVisualiser/BiomeVisualiser.vcproj
  27. +0 −42 Tools/BiomeVisualiser/GeneratorBiomeSource.h
  28. +0 −120 Tools/BiomeVisualiser/Pixmap.cpp
  29. +0 −39 Tools/BiomeVisualiser/Pixmap.h
  30. +0 −40 Tools/BiomeVisualiser/Timer.h
  31. +0 −143 Tools/BiomeVisualiser/WndProcThunk.h
  32. +0 −70 Tools/BiomeVisualiser/profile_run.cmd
  33. +2 −0 Tools/QtBiomeVisualiser/.gitignore
  34. +427 −0 Tools/QtBiomeVisualiser/BiomeView.cpp
  35. +100 −0 Tools/QtBiomeVisualiser/BiomeView.h
  36. +126 −0 Tools/QtBiomeVisualiser/ChunkCache.cpp
  37. +72 −0 Tools/QtBiomeVisualiser/ChunkCache.h
  38. +29 −0 Tools/QtBiomeVisualiser/ChunkLoader.cpp
  39. +45 −0 Tools/QtBiomeVisualiser/ChunkLoader.h
  40. +421 −0 Tools/QtBiomeVisualiser/ChunkSource.cpp
  41. +107 −0 Tools/QtBiomeVisualiser/ChunkSource.h
  42. +159 −0 Tools/QtBiomeVisualiser/GeneratorSetup.cpp
  43. +64 −0 Tools/QtBiomeVisualiser/GeneratorSetup.h
  44. +386 −0 Tools/QtBiomeVisualiser/Globals.h
  45. +310 −0 Tools/QtBiomeVisualiser/MainWindow.cpp
  46. +96 −0 Tools/QtBiomeVisualiser/MainWindow.h
  47. +20 −0 Tools/QtBiomeVisualiser/QtBiomeVisualiser.cpp
  48. +100 −0 Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro
  49. +35 −0 Tools/QtBiomeVisualiser/QtChunk.cpp
  50. +40 −0 Tools/QtBiomeVisualiser/QtChunk.h
  51. +1 −1 lib/SQLiteCpp
  52. +1 −1 lib/polarssl
  53. +2 −0 src/Bindings/CMakeLists.txt
  54. +0 −5 src/Bindings/DeprecatedBindings.cpp
  55. +0 −1 src/Bindings/LuaChunkStay.cpp
  56. +1 −0 src/Bindings/LuaChunkStay.h
  57. +0 −1 src/Bindings/LuaState.h
  58. +0 −1 src/Bindings/LuaWindow.cpp
  59. +0 −2 src/Bindings/ManualBindings.cpp
  60. +8 −6 src/Bindings/Plugin.h
  61. +3 −1 src/Bindings/PluginLua.cpp
  62. +0 −2 src/Bindings/PluginManager.cpp
  63. +3 −3 src/Bindings/PluginManager.h
  64. +0 −1 src/Bindings/WebPlugin.cpp
  65. +0 −1 src/Bindings/WebPlugin.h
  66. +2 −3 src/BlockEntities/BlockEntity.h
  67. +6 −7 src/BlockEntities/BlockEntityWithItems.h
  68. +0 −1 src/BlockEntities/ChestEntity.cpp
  69. +0 −2 src/BlockEntities/ChestEntity.h
  70. +2 −4 src/BlockEntities/CommandBlockEntity.cpp
  71. +4 −3 src/BlockEntities/CommandBlockEntity.h
  72. +2 −5 src/BlockEntities/DispenserEntity.cpp
  73. +0 −1 src/BlockEntities/DropSpenserEntity.cpp
  74. +0 −1 src/BlockEntities/DropSpenserEntity.h
  75. +0 −2 src/BlockEntities/DropperEntity.cpp
  76. +2 −2 src/BlockEntities/EnderChestEntity.cpp
  77. +1 −2 src/BlockEntities/EnderChestEntity.h
  78. +0 −1 src/BlockEntities/FlowerPotEntity.cpp
  79. +1 −1 src/BlockEntities/FlowerPotEntity.h
  80. +0 −2 src/BlockEntities/FurnaceEntity.cpp
  81. +0 −1 src/BlockEntities/FurnaceEntity.h
  82. +0 −3 src/BlockEntities/HopperEntity.cpp
  83. +2 −2 src/BlockEntities/JukeboxEntity.cpp
  84. +0 −1 src/BlockEntities/JukeboxEntity.h
  85. +0 −1 src/BlockEntities/MobHeadEntity.cpp
  86. +1 −1 src/BlockEntities/MobHeadEntity.h
  87. +1 −1 src/BlockEntities/NoteEntity.cpp
  88. +1 −1 src/BlockEntities/RedstonePoweredEntity.h
  89. +2 −2 src/BlockEntities/SignEntity.cpp
  90. +28 −28 src/BlockID.cpp
  91. +39 −1 src/BlockID.h
  92. +68 −43 src/BlockInfo.cpp
  93. +28 −3 src/BlockInfo.h
  94. +9 −0 src/Blocks/BlockBed.cpp
  95. +5 −3 src/Blocks/BlockBed.h
  96. +4 −4 src/Blocks/BlockBigFlower.h
  97. +2 −2 src/Blocks/BlockDirt.h
  98. +0 −1 src/Blocks/BlockDoor.cpp
  99. +44 −1 src/Blocks/BlockDoor.h
  100. +1 −1 src/Blocks/BlockFenceGate.h
  101. +45 −41 src/Blocks/BlockHandler.cpp
  102. +5 −5 src/Blocks/BlockHandler.h
  103. +2 −2 src/Blocks/BlockMobHead.h
  104. +1 −0 src/Blocks/BlockPiston.cpp
  105. +2 −1 src/Blocks/BlockPiston.h
  106. +1 −1 src/Blocks/BlockPortal.h
  107. +3 −3 src/Blocks/BlockPumpkin.h
  108. +1 −1 src/Blocks/BlockRedstoneRepeater.h
  109. +30 −0 src/Blocks/BlockSeaLantern.h
  110. +4 −1 src/Blocks/BlockSlab.h
  111. +1 −1 src/Blocks/BlockVine.h
  112. +133 −0 src/Blocks/ChunkInterface.cpp
  113. +15 −51 src/Blocks/ChunkInterface.h
  114. +91 −0 src/Blocks/GetHandlerCompileTimeTemplate.h
  115. +4 −3 src/Blocks/WorldInterface.h
  116. +47 −1 src/ByteBuffer.cpp
  117. +3 −0 src/ByteBuffer.h
  118. +9 −5 src/Chunk.cpp
  119. +11 −13 src/Chunk.h
  120. +3 −3 src/ChunkMap.cpp
  121. +1 −1 src/ChunkMap.h
  122. +1 −0 src/ChunkSender.cpp
  123. +115 −51 src/ClientHandle.cpp
  124. +84 −68 src/ClientHandle.h
  125. +178 −0 src/CompositeChat.cpp
  126. +6 −0 src/CompositeChat.h
  127. +2 −0 src/Defines.h
  128. +0 −1 src/Entities/ArrowEntity.cpp
  129. +2 −0 src/Entities/Boat.cpp
  130. +1 −1 src/Entities/EnderCrystal.cpp
  131. +41 −32 src/Entities/Entity.cpp
  132. +7 −1 src/Entities/Entity.h
  133. +89 −2 src/Entities/EntityEffect.cpp
  134. +8 −0 src/Entities/EntityEffect.h
  135. +18 −1 src/Entities/ExpBottleEntity.cpp
  136. +5 −0 src/Entities/ExpBottleEntity.h
  137. +23 −2 src/Entities/HangingEntity.cpp
  138. +1 −1 src/Entities/HangingEntity.h
  139. +3 −1 src/Entities/ItemFrame.cpp
  140. +47 −44 src/Entities/Minecart.cpp
  141. +2 −1 src/Entities/Minecart.h
  142. +6 −3 src/Entities/Pawn.cpp
  143. +76 −18 src/Entities/Player.cpp
  144. +18 −0 src/Entities/Player.h
  145. +5 −5 src/Entities/ThrownEggEntity.cpp
  146. +2 −2 src/Entities/ThrownSnowballEntity.cpp
  147. +103 −80 src/Generating/BioGen.cpp
  148. +1 −1 src/Generating/Caves.cpp
  149. +1 −0 src/Generating/FinishGen.cpp
  150. +2 −2 src/Generating/Noise3DGenerator.cpp
  151. +31 −1 src/Globals.h
  152. +1 −0 src/Items/ItemBucket.h
  153. +16 −1 src/Items/ItemDoor.h
  154. +5 −2 src/Items/ItemFood.h
  155. +1 −0 src/Items/ItemGoldenApple.h
  156. +59 −28 src/Items/ItemHandler.cpp
  157. +0 −1 src/Items/ItemHoe.h
  158. +6 −2 src/Items/ItemMilk.h
  159. +53 −0 src/Items/ItemMushroomSoup.h
  160. +6 −2 src/Items/ItemPotion.h
  161. +28 −28 src/Items/ItemSpawnEgg.h
  162. +10 −11 src/LineBlockTracer.cpp
  163. +4 −4 src/Map.cpp
  164. +50 −50 src/MobSpawner.cpp
  165. +6 −6 src/MobSpawner.h
  166. +1 −1 src/Mobs/AggressiveMonster.cpp
  167. +1 −1 src/Mobs/AggressiveMonster.h
  168. +117 −59 src/Mobs/Monster.cpp
  169. +38 −43 src/Mobs/Monster.h
  170. +41 −0 src/Mobs/MonsterTypes.h
  171. +1 −1 src/Mobs/Mooshroom.cpp
  172. +1 −1 src/Mobs/PassiveAggressiveMonster.cpp
  173. +1 −1 src/Mobs/PassiveAggressiveMonster.h
  174. +1 −1 src/Mobs/PassiveMonster.cpp
  175. +1 −1 src/Mobs/PassiveMonster.h
  176. +3 −1 src/Mobs/Sheep.cpp
  177. +3 −3 src/Mobs/Villager.cpp
  178. +1 −1 src/Mobs/Villager.h
  179. +7 −7 src/OSSupport/File.cpp
  180. +1 −1 src/OSSupport/IsThread.h
  181. +2 −0 src/Protocol/CMakeLists.txt
  182. +77 −2 src/Protocol/ChunkDataSerializer.cpp
  183. +4 −2 src/Protocol/ChunkDataSerializer.h
  184. +75 −70 src/Protocol/Protocol.h
  185. +77 −33 src/Protocol/Protocol125.cpp
  186. +74 −70 src/Protocol/Protocol125.h
  187. +9 −2 src/Protocol/Protocol132.cpp
  188. +0 −6 src/Protocol/Protocol14x.cpp
  189. +2 −2 src/Protocol/Protocol15x.cpp
  190. +1 −1 src/Protocol/Protocol15x.h
  191. +131 −214 src/Protocol/Protocol17x.cpp
  192. +83 −80 src/Protocol/Protocol17x.h
  193. +3,270 −0 src/Protocol/Protocol18x.cpp
  194. +337 −0 src/Protocol/Protocol18x.h
  195. +73 −10 src/Protocol/ProtocolRecognizer.cpp
  196. +76 −71 src/Protocol/ProtocolRecognizer.h
  197. +2 −2 src/Root.cpp
  198. +7 −0 src/Server.cpp
  199. +8 −0 src/Server.h
  200. +0 −1 src/Simulator/CMakeLists.txt
  201. +11 −0 src/Simulator/FireSimulator.cpp
  202. +1 −1 src/Simulator/FireSimulator.h
  203. +1 −0 src/Simulator/FloodyFluidSimulator.cpp
  204. +4 −3 src/Simulator/FluidSimulator.h
  205. +15 −2,207 src/Simulator/IncrementalRedstoneSimulator.cpp
  206. +3 −310 src/Simulator/IncrementalRedstoneSimulator.h
  207. +2,588 −0 src/Simulator/IncrementalRedstoneSimulator.inc
  208. +2 −2 src/Simulator/NoopRedstoneSimulator.h
  209. +0 −19 src/Simulator/RedstoneSimulator.cpp
  210. +14 −3 src/Simulator/RedstoneSimulator.h
  211. +1 −0 src/Simulator/SandSimulator.cpp
  212. +5 −4 src/Simulator/SandSimulator.h
  213. +4 −41 src/Simulator/Simulator.cpp
  214. +6 −12 src/Simulator/Simulator.h
  215. +45 −0 src/Simulator/Simulator.inc
  216. +1 −1 src/Simulator/SimulatorManager.cpp
  217. +2 −2 src/Simulator/SimulatorManager.h
  218. +28 −0 src/StringUtils.cpp
  219. +5 −0 src/StringUtils.h
  220. +2 −2 src/Tracer.cpp
  221. +28 −0 src/UI/Window.cpp
  222. +2 −1 src/UI/Window.h
  223. +57 −11 src/UI/WindowOwner.h
  224. +105 −21 src/VoronoiMap.cpp
  225. +37 −7 src/VoronoiMap.h
  226. +103 −16 src/World.cpp
  227. +40 −32 src/World.h
  228. +1 −1 src/WorldStorage/FastNBT.cpp
  229. +4 −4 src/WorldStorage/FastNBT.h
  230. +9 −9 src/WorldStorage/MapSerializer.cpp
  231. +2 −2 src/WorldStorage/MapSerializer.h
  232. +75 −45 src/WorldStorage/NBTChunkSerializer.cpp
  233. +2 −0 src/WorldStorage/NBTChunkSerializer.h
  234. +82 −14 src/WorldStorage/WSSAnvil.cpp
  235. +1 −0 tests/CMakeLists.txt
  236. +10 −0 tests/Redstone/CMakeLists.txt
  237. +164 −0 tests/Redstone/creatable.cpp
View
@@ -9,7 +9,7 @@
url = https://github.com/bearbin/transapi.git
[submodule "lib/polarssl"]
path = lib/polarssl
url = https://github.com/mc-server/polarssl
url = https://github.com/mc-server/polarssl.git
[submodule "lib/SQLiteCpp"]
path = lib/SQLiteCpp
url = https://github.com/mc-server/SQLiteCpp.git
View
@@ -29,5 +29,6 @@ worktycho
xoft
Yeeeeezus (Donated AlchemistVillage prefabs)
Howaner
Masy98
Please add yourself to this list if you contribute to MCServer.
@@ -1634,13 +1634,20 @@ a_Player:OpenWindow(Window);
]],
Functions =
{
HasCustomName = { Params = "", Return = "bool", Notes = "Returns true if the monster has a custom name." },
GetCustomName = { Params = "", Return = "string", Notes = "Gets the custom name of the monster. If no custom name is set, the function returns an empty string." },
SetCustomName = { Params = "string", Return = "", Notes = "Sets the custom name of the monster. You see the name over the monster. If you want to disable the custom name, simply set an empty string." },
IsCustomNameAlwaysVisible = { Params = "", Return = "bool", Notes = "Is the custom name of this monster always visible? If not, you only see the name when you sight the mob." },
SetCustomNameAlwaysVisible = { Params = "bool", Return = "", Notes = "Sets the custom name visiblity of this monster. If it's false, you only see the name when you sight the mob. If it's true, you always see the custom name." },
FamilyFromType = { Params = "{{cMonster#MobType|MobType}}", Return = "{{cMonster#MobFamily|MobFamily}}", Notes = "(STATIC) Returns the mob family ({{cMonster#MobFamily|mfXXX}} constants) based on the mob type ({{cMonster#MobType|mtXXX}} constants)" },
GetMobFamily = { Params = "", Return = "{{cMonster#MobFamily|MobFamily}}", Notes = "Returns this mob's family ({{cMonster#MobFamily|mfXXX}} constant)" },
GetMobType = { Params = "", Return = "{{cMonster#MobType|MobType}}", Notes = "Returns the type of this mob ({{cMonster#MobType|mtXXX}} constant)" },
GetSpawnDelay = { Params = "{{cMonster#MobFamily|MobFamily}}", Return = "number", Notes = "(STATIC) Returns the spawn delay - the number of game ticks between spawn attempts - for the specified mob family." },
MobTypeToString = { Params = "{{cMonster#MobType|MobType}}", Return = "string", Notes = "(STATIC) Returns the string representing the given mob type ({{cMonster#MobType|mtXXX}} constant), or empty string if unknown type." },
MoveToPosition = { Params = "Position", Return = "", Notes = "Moves mob to the specified position" },
StringToMobType = { Params = "string", Return = "{{cMonster#MobType|MobType}}", Notes = "(STATIC) Returns the mob type ({{cMonster#MobType|mtXXX}} constant) parsed from the string type (\"creeper\"), or mtInvalidType if unrecognized." },
GetRelativeWalkSpeed = { Params = "", Return = "number", Notes = "Returns the relative walk speed of this mob. Standard is 1.0" },
SetRelativeWalkSpeed = { Params = "number", Return = "", Notes = "Sets the relative walk speed of this mob. Standard is 1.0" },
},
Constants =
{
@@ -1757,6 +1764,7 @@ a_Player:OpenWindow(Window);
ForceSetSpeed = { Params = "{{Vector3d|Direction}}", Notes = "Forces the player to move to the given direction." },
GetClientHandle = { Params = "", Return = "{{cClientHandle}}", Notes = "Returns the client handle representing the player's connection. May be nil (AI players)." },
GetColor = { Return = "string", Notes = "Returns the full color code to be used for this player's messages (based on their rank). Prefix player messages with this code." },
GetPlayerListName = { Return = "string", Notes = "Returns the name that is used in the playerlist." },
GetCurrentXp = { Params = "", Return = "number", Notes = "Returns the current amount of XP" },
GetEffectiveGameMode = { Params = "", Return = "{{Globals#GameMode|GameMode}}", Notes = "(OBSOLETE) Returns the current resolved game mode of the player. If the player is set to inherit the world's gamemode, returns that instead. See also GetGameMode() and IsGameModeXXX() functions. Note that this function is the same as GetGameMode(), use that function instead." },
GetEquippedItem = { Params = "", Return = "{{cItem}}", Notes = "Returns the item that the player is currently holding; empty item if holding nothing." },
@@ -1807,6 +1815,9 @@ a_Player:OpenWindow(Window);
SendMessagePrivateMsg = { Params = "Message, SenderName", Return = "", Notes = "Prepends Light Blue [MSG: *SenderName*] / prepends SenderName and colours entire text (depending on ShouldUseChatPrefixes()) and sends message to player. For private messaging." },
SendMessageSuccess = { Params = "Message", Return = "", Notes = "Prepends Green [INFO] / colours entire text (depending on ShouldUseChatPrefixes()) and sends message to player. Success notification." },
SendMessageWarning = { Params = "Message, Sender", Return = "", Notes = "Prepends Rose [WARN] / colours entire text (depending on ShouldUseChatPrefixes()) and sends message to player. Denotes that something concerning, such as plugin reload, is about to happen." },
HasCustomName = { Params = "", Return = "bool", Notes = "Returns true if the player has a custom name." },
GetCustomName = { Params = "", Return = "string", Notes = "Returns the custom name of this player. If the player hasn't a custom name, it will return an empty string." },
SetCustomName = { Params = "string", Return = "", Notes = "Sets the custom name of this player. If you want to disable the custom name, simply set an empty string. The custom name will be used in the tab-list, in the player nametag and in the tab-completion." },
SetCanFly = { Params = "CanFly", Notes = "Sets if the player can fly or not." },
SetCrouch = { Params = "IsCrouched", Return = "", Notes = "Sets the crouch state, broadcasts the change to other players." },
SetCurrentExperience = { Params = "XPAmount", Return = "", Notes = "Sets the current amount of experience (and indirectly, the XP level)." },
@@ -6,8 +6,9 @@ return
DefaultFnName = "OnSpawningEntity", -- also used as pagename
Desc = [[
This hook is called before the server spawns an {{cEntity|entity}}. The plugin can either modify the
entity before it is spawned, or disable the spawning altogether. If the entity spawning is a
monster, the {{OnSpawningMonster|HOOK_SPAWNING_MONSTER}} hook is called before this hook.</p>
entity before it is spawned, or disable the spawning altogether. You can't disable the spawning if the
entity is a player. If the entity spawning is a monster, the {{OnSpawningMonster|HOOK_SPAWNING_MONSTER}}
hook is called before this hook.</p>
<p>
See also the {{OnSpawnedEntity|HOOK_SPAWNED_ENTITY}} hook for a similar hook called after the
entity is spawned.
Submodule Core updated from bd2391 to 9de860
@@ -38,6 +38,7 @@ function Initialize(Plugin)
-- _X: Disabled so that the normal operation doesn't interfere with anything
-- PM:AddHook(cPluginManager.HOOK_CHUNK_GENERATED, OnChunkGenerated);
PM:BindCommand("/nick", "debuggers", HandleNickCmd, "- Gives you a custom name");
PM:BindCommand("/le", "debuggers", HandleListEntitiesCmd, "- Shows a list of all the loaded entities");
PM:BindCommand("/ke", "debuggers", HandleKillEntitiesCmd, "- Kills all the loaded entities");
PM:BindCommand("/wool", "debuggers", HandleWoolCmd, "- Sets all your armor to blue wool");
@@ -770,6 +771,21 @@ end
function HandleNickCmd(Split, Player)
if (Split[2] == nil) then
Player:SendMessage("Usage: /nick [CustomName]");
return true;
end
Player:SetCustomName(Split[2]);
Player:SendMessageSuccess("Custom name setted to " .. Player:GetCustomName() .. "!")
return true
end
function HandleListEntitiesCmd(Split, Player)
local NumEntities = 0;
@@ -1502,7 +1518,7 @@ function OnPlayerJoined(a_Player)
-- Test composite chat chaining:
a_Player:SendMessage(cCompositeChat()
:AddTextPart("Hello, ")
:AddUrlPart(a_Player:GetName(), "www.mc-server.org", "u@2")
:AddUrlPart(a_Player:GetName(), "http://www.mc-server.org", "u@2")
:AddSuggestCommandPart(", and welcome.", "/help", "u")
:AddRunCommandPart(" SetDay", "/time set 0")
)
View
@@ -348,6 +348,7 @@ Emerald, 9 = EmeraldBlock, *
RedstoneDust, 9 = RedstoneBlock, *
Coal, 9 = CoalBlock, *
Clay, 4 = ClayBlock, *
SlimeBall, 9 = SlimeBlock, *
Painting = Stick, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | Wool, 2:2
ItemFrame = Stick, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | Leather, 2:2
View
@@ -1,13 +1,13 @@
[Items]
air=0
stone=1
rock=1
granite=1:1
polishedgranite=1:2
diorite=1:3
polisheddiorite=1:4
andesite=1:5
polishedandesite=1:6
stone=1
grass=2
dirt=3
coarseddirt=3:1
@@ -410,7 +410,7 @@ lightgraystainedclay=159:8
lightgreystainedclay=159:8
ltgraystainedclay=159:8
ltgreystainedclay=159:8
silvertsainedclay=159:8
silverstainedclay=159:8
cyanstainedclay=159:9
purplestainedclay=159:10
violetstainedclay=159:10
@@ -471,6 +471,7 @@ darkoakwoodstairs=164
bigoakwoodstiars=164
roofedoakwoodstairs=164
slimeblock=165
barrier=166
irontrapdoor=167
prismarine=168
prismarinebricks=168:1
@@ -525,7 +526,8 @@ redsandstone=179
chiseledredsandstone=179:1
smoothredsandstone=179:2
redsandstonestairs=180
redsandstoneslab=182
newstoneslab=182
redsandstoneslab=182:0
sprucefencegate=183
coniferfencegate=183
pinefencegate=183
@@ -698,7 +700,11 @@ lightdust=348
glowdust=348
fish=349
rawfish=349
rawsalmon=349:1
clownfish=349:2
pufferfish=349:3
cookedfish=350
cookedsalmon=350:1
dye=351
inksac=351:0
blackdye=351:0
Oops, something went wrong.

Showing you all comments on commits in this comparison.

@NiLSPACE

This comment has been minimized.

Show comment
Hide comment
@NiLSPACE

NiLSPACE Sep 15, 2014

Member

Will this change world generation?

Member

NiLSPACE commented on 96f45a4 Sep 15, 2014

Will this change world generation?

@madmaxoft

This comment has been minimized.

Show comment
Hide comment
@madmaxoft

madmaxoft Sep 16, 2014

Member

I hope not, I was careful to make the defaults work the same as before.

But it will allow me to make a better biome generator, I already have a working prototype that has some nice properties, but want to polish it up first.

Member

madmaxoft commented on 96f45a4 Sep 16, 2014

I hope not, I was careful to make the defaults work the same as before.

But it will allow me to make a better biome generator, I already have a working prototype that has some nice properties, but want to polish it up first.

@tigerw

This comment has been minimized.

Show comment
Hide comment
@tigerw

tigerw Sep 17, 2014

Member

Well, that was

Easy

Member

tigerw commented on 8231770 Sep 17, 2014

Well, that was

Easy

@Howaner

This comment has been minimized.

Show comment
Hide comment
@Howaner

Howaner Sep 17, 2014

Contributor

But the authenticator replaces the given uuid with the offline uuid, right?

  • Authenticator.cpp:59
  • ClientHandle.cpp:315
Contributor

Howaner commented on 8231770 Sep 17, 2014

But the authenticator replaces the given uuid with the offline uuid, right?

  • Authenticator.cpp:59
  • ClientHandle.cpp:315
@madmaxoft

This comment has been minimized.

Show comment
Hide comment
@madmaxoft

madmaxoft Sep 17, 2014

Member

Oh. You're right. But for some reason it did seem to work for me - the player even had the correct skin.
I'll fix the authenticator, then.

Member

madmaxoft commented on 8231770 Sep 17, 2014

Oh. You're right. But for some reason it did seem to work for me - the player even had the correct skin.
I'll fix the authenticator, then.

@Howaner

This comment has been minimized.

Show comment
Hide comment
@Howaner

Howaner Sep 17, 2014

Contributor

1.7.10 clients displays his own skin without any server operations. (It's not for other players or 1.8)

Contributor

Howaner commented on 8231770 Sep 17, 2014

1.7.10 clients displays his own skin without any server operations. (It's not for other players or 1.8)

@Howaner

This comment has been minimized.

Show comment
Hide comment
@Howaner

Howaner Sep 17, 2014

Contributor

What if a player fakes this packet?
He could change his UUID, right?

Contributor

Howaner commented on 3406957 Sep 17, 2014

What if a player fakes this packet?
He could change his UUID, right?

@madmaxoft

This comment has been minimized.

Show comment
Hide comment
@madmaxoft

madmaxoft Sep 17, 2014

Member

That's an interesting attack vector. I wonder if the original server is vulnerable, too.

So we need a setting to explicitly allow this parsing, hmmmm.

Member

madmaxoft commented on 3406957 Sep 17, 2014

That's an interesting attack vector. I wonder if the original server is vulnerable, too.

So we need a setting to explicitly allow this parsing, hmmmm.

@madmaxoft

This comment has been minimized.

Show comment
Hide comment
@madmaxoft

madmaxoft Sep 17, 2014

Member

I tested with 2 clients on the same server.

Member

madmaxoft commented on 8231770 Sep 17, 2014

I tested with 2 clients on the same server.

@md-5

This comment has been minimized.

Show comment
Hide comment
@md-5

md-5 Sep 18, 2014

Can I just double check you have some sort of toggle / IP whitelist for this? Wouldn't want users spoofing their details :p

md-5 commented on 8231770 Sep 18, 2014

Can I just double check you have some sort of toggle / IP whitelist for this? Wouldn't want users spoofing their details :p

@md-5

This comment has been minimized.

Show comment
Hide comment
@md-5

md-5 Sep 18, 2014

Nevermind, seems you discussed it:
3406957#commitcomment-7819995

Ideally you have either a boolean configuration value, bungeecord: false, or an IP whitelist similar to what webservers do for X-Forwarded-For. Since BungeeCord requires offline mode and the server should be firewalled, a boolean is probably good enough.

md-5 commented on 8231770 Sep 18, 2014

Nevermind, seems you discussed it:
3406957#commitcomment-7819995

Ideally you have either a boolean configuration value, bungeecord: false, or an IP whitelist similar to what webservers do for X-Forwarded-For. Since BungeeCord requires offline mode and the server should be firewalled, a boolean is probably good enough.

@tigerw

This comment has been minimized.

Show comment
Hide comment
@tigerw

tigerw Sep 23, 2014

Member

Does a wolf's colour need to be an integer in the first place?

Also, whoops, I think I might have written this originally.

Member

tigerw commented on 8d9dfc5 Sep 23, 2014

Does a wolf's colour need to be an integer in the first place?

Also, whoops, I think I might have written this originally.

@tigerw

This comment has been minimized.

Show comment
Hide comment
@tigerw

tigerw Sep 23, 2014

Member

We need a list of all the compatibility code we have :P

Member

tigerw commented on 8d9dfc5 Sep 23, 2014

We need a list of all the compatibility code we have :P

@tigerw

This comment has been minimized.

Show comment
Hide comment
@tigerw

tigerw Sep 23, 2014

Member

Error checking yey~

Member

tigerw commented on 0b40ce9 Sep 23, 2014

Error checking yey~

@madmaxoft

This comment has been minimized.

Show comment
Hide comment
@madmaxoft

madmaxoft Sep 24, 2014

Member

I think the color follows the minecraft 16-item palette so even 4 bits should be enough.

Member

madmaxoft commented on 8d9dfc5 Sep 24, 2014

I think the color follows the minecraft 16-item palette so even 4 bits should be enough.

@madmaxoft

This comment has been minimized.

Show comment
Hide comment
@madmaxoft

madmaxoft Sep 24, 2014

Member

Builds failing, a_Writer -> m_Writer

Member

madmaxoft commented on 1d588b5 Sep 24, 2014

Builds failing, a_Writer -> m_Writer

@worktycho

This comment has been minimized.

Show comment
Hide comment
@worktycho

worktycho Sep 25, 2014

Member

Why?? This just caused me a whole file merge conflict.

Member

worktycho commented on c6f78d5 Sep 25, 2014

Why?? This just caused me a whole file merge conflict.

@tigerw

This comment has been minimized.

Show comment
Hide comment
@tigerw

tigerw Sep 25, 2014

Member

Haven't you realised by now? You're giving him a run for his money with regards to most knowledgeable developer, so he is subtly trying to make life hard for you.


So the redstone simulator isn't that complex, no? You figured out enough of it to fix a crash.

Member

tigerw commented on c6f78d5 Sep 25, 2014

Haven't you realised by now? You're giving him a run for his money with regards to most knowledgeable developer, so he is subtly trying to make life hard for you.


So the redstone simulator isn't that complex, no? You figured out enough of it to fix a crash.

@Howaner

This comment has been minimized.

Show comment
Hide comment
@Howaner

Howaner Sep 25, 2014

Contributor

You broke the login :(
Now HandlePluginMessage() and ReadItem() need a change.

Contributor

Howaner commented on aeabc4f Sep 25, 2014

You broke the login :(
Now HandlePluginMessage() and ReadItem() need a change.

@madmaxoft

This comment has been minimized.

Show comment
Hide comment
@madmaxoft

madmaxoft Sep 25, 2014

Member

Actually without this change I cannot even ping the server.

Member

madmaxoft commented on aeabc4f Sep 25, 2014

Actually without this change I cannot even ping the server.

@madmaxoft

This comment has been minimized.

Show comment
Hide comment
@madmaxoft

madmaxoft Sep 25, 2014

Member

I just figured out there was a coord mismatch and this function seemed simple enough for me to fix it. I had a crash in here, so I needed to fix it, sorry @worktycho.

Member

madmaxoft commented on c6f78d5 Sep 25, 2014

I just figured out there was a coord mismatch and this function seemed simple enough for me to fix it. I had a crash in here, so I needed to fix it, sorry @worktycho.

@worktycho

This comment has been minimized.

Show comment
Hide comment
@worktycho
Member

worktycho commented on c6f78d5 Sep 25, 2014

@madmaxoft Its fine

@tigerw

This comment has been minimized.

Show comment
Hide comment
@tigerw

tigerw Sep 25, 2014

Member

*apostrophe

Member

tigerw commented on c6f78d5 Sep 25, 2014

*apostrophe

@tigerw

This comment has been minimized.

Show comment
Hide comment
@tigerw

tigerw Sep 25, 2014

Member

I can't think in binary and have no idea what this does, perchance a comment?

Member

tigerw commented on 0443f5d Sep 25, 2014

I can't think in binary and have no idea what this does, perchance a comment?

@parabyte

This comment has been minimized.

Show comment
Hide comment
@parabyte

parabyte Sep 25, 2014

nice please keep adding the comments !

parabyte commented on 6b260f0 Sep 25, 2014

nice please keep adding the comments !

@worktycho

This comment has been minimized.

Show comment
Hide comment
@worktycho

worktycho Sep 28, 2014

Member

Can fail. Need to check the return value.

Member

worktycho commented on 2718737 Sep 28, 2014

Can fail. Need to check the return value.

@madmaxoft

This comment has been minimized.

Show comment
Hide comment
@madmaxoft

madmaxoft Sep 28, 2014

Member

We should check CompressedSize against PacketLen instead (to prevent Heartbleed-like errors)

Member

madmaxoft commented on 2718737 Sep 28, 2014

We should check CompressedSize against PacketLen instead (to prevent Heartbleed-like errors)

@madmaxoft

This comment has been minimized.

Show comment
Hide comment
@madmaxoft

madmaxoft Sep 28, 2014

Member

Done.

Member

madmaxoft commented on 2718737 Sep 28, 2014

Done.