Commit graph

3181 commits

Author SHA1 Message Date
Shane Freeder
225bfcff56
[CI-SKIP] Travis: linux sudo vm's have more ram, also stop travis screwing with the git modules 2017-08-12 21:15:37 +01:00
Zach
b22423be8b Merge pull request #853 from Brokkonaut/dragon-egg-falling
I forgot the // Paper comment
2017-08-11 21:39:54 -05:00
Brokkonaut
fe8ce33ef5 I forgot the // Paper comment 2017-08-12 02:23:35 +02:00
Zach Brown
bab98cf5ff
Don't let Player#getLocale return null
Thanks for reporting @MatrixTunnel
2017-08-11 18:16:00 -05:00
Zach Brown
a8508dc5df
Remove null values in TileEntity tick list
Because who wouldn't want to tick a null tile entity right?
Fixes GH-851
2017-08-11 17:59:44 -05:00
Shane Freeder
912ee23e25
Update CB 2017-08-11 13:05:23 +01:00
Zach Brown
98d8483c7a
Skip paperclip step on Travis-CI 2017-08-10 21:14:10 -05:00
Zach Brown
3338148247
Start using Travis-CI again
The only way to get Paper to build, specifically past the jar remap
step, is to use a macOS host. Don't ask me why, I'm just the messenger.
2017-08-10 21:07:41 -05:00
Zach Brown
0181286eb9
Fix MC-117075: TE Unload Lag Spike
PaperMC port of https://github.com/MinecraftForge/MinecraftForge/pull/4281
2017-08-10 21:06:53 -05:00
Shane Freeder
4d3e4470b4 Merge pull request #849 from Brokkonaut/dragon-egg-falling
MC-94186 Fix dragon egg falling in lazy chunks
2017-08-11 02:54:29 +01:00
Brokkonaut
c84dd9edfe MC-94186 Fix dragon egg falling in lazy chunks
Fixes falling dragon eggs in lazy chunks fall to the block below the last empty block and replacing that block with them.

See also https://bugs.mojang.com/browse/MC-94186
2017-08-11 03:36:59 +02:00
Shane Freeder
42faa9e529 Update CB (#846) 2017-08-09 14:44:28 -04:00
BillyGalbreath
6f32c51336 Ocelot despawns should honor nametags and leash (#821) 2017-08-07 23:26:44 -04:00
BillyGalbreath
128c35000b Reset spawner timer when spawner event is cancelled (#819) 2017-08-07 23:25:59 -04:00
chickeneer
52c8fc7633 Fix Nether Portal Creation on cancelled event
Spigot is manipulating the Travel Agents canCreatePortal, but forgot to reset it on cancel

This causes nether portals to not be generated if the event is ever cancelled
2017-08-07 23:08:50 -04:00
Aikar
ff5bd7b03b Upstream update 2017-08-07 23:05:16 -04:00
kashike
5ac8a3f491 Merge pull request #842 from DemonWav/feature/speedup
Fix this stupid bullshit
2017-08-06 15:41:49 -07:00
DemonWav
1ff893abe1
Fix this stupid bullshit 2017-08-06 17:18:20 -05:00
Zach
ab6f5deb59 Merge pull request #840 from electronicboy/master
fix construction order in CraftBanner
2017-08-06 10:42:52 -05:00
Shane Freeder
efe49baecf
fix construction order in CraftBanner 2017-08-06 16:36:48 +01:00
kashike
7f38d169dc Merge pull request #837 from electronicboy/mergy
Update B/CB/S
2017-08-05 16:36:44 -07:00
Shane Freeder
bec1253aa9
Update B/CB/S 2017-08-06 00:08:21 +01:00
Zach Brown
f7e23ba7fa
Update upstream CB 2017-08-04 22:10:30 -05:00
kashike
1b363377f7 Merge pull request #830 from Minecrell/jline-3.4.0
Update JLine to 3.4.0
2017-08-04 08:09:42 -07:00
Minecrell
9f3f6e02a6 Update JLine to 3.4.0. Fixes #736 2017-08-04 09:15:09 +02:00
kashike
7962fe6489 Merge pull request #827 from Black-Hole/1.12.1
Update to 1.12.1
2017-08-03 08:43:21 -07:00
BlackHole
6879328bf6 Update to 1.12.1 2017-08-03 17:27:54 +02:00
kashike
2e157dd1b4 Merge pull request #822 from BillyGalbreath/Plugins-list-alphabatized
Make /plugins list alphabetical
2017-07-31 19:39:42 -07:00
BillyGalbreath
2670d1f8eb Make /plugins list alphabetical 2017-07-31 02:09:13 -05:00
Aikar
cdd6d8562a Update Upstream 2017-07-30 18:41:08 -04:00
kashike
051c0b5898 Merge pull request #812 from electronicboy/upstream
Update B/CB
2017-07-28 08:47:48 -07:00
Shane Freeder
fed4815fff
Update B/CB 2017-07-28 15:51:46 +01:00
Aikar
d841b8a345 Further refine logic 2017-07-28 00:04:01 -04:00
Aikar
5b6dfbc428 ProfileWhitelistVerifyEvent
Fires when the server is validating if a player is whitelisted.

Allows you to do dynamic whitelisting and change of kick message
2017-07-27 23:42:19 -04:00
Zach Brown
5c5e998cde
There is no reason to continue if we DC a player during shutdown
Thanks Ice
2017-07-27 21:40:07 -05:00
Aikar
7afc930c25 Fix a bug in recipe books that prevented them from working as they should 2017-07-27 09:38:21 -04:00
Aikar
11f2794bbe Remove use of FastUtil for unload queue, very bad performance 2017-07-27 00:25:13 -04:00
Aikar
fabe552ae9 Resolves GH-806: Respect saving disabled before unloading all chunks in a world
This behavior causes a save to occur even though saving was supposed to be turned off.

It's triggered when Hell/End worlds are empty of players.
2017-07-27 00:09:24 -04:00
Aikar
7a8cce428f Rebuild patches (forgot to pull :() 2017-07-26 23:45:03 -04:00
Aikar
9a7cdcec39 Add getI18NDisplayName API
Gets the Display name as seen in the Client.
Currently the server only supports the English language. To override this,
You must replace the language file embedded in the server jar.
2017-07-26 23:44:29 -04:00
Aikar
8e78124e46 Implement ensureServerConversions API
This will take a Bukkit ItemStack and run it through any conversions a server process would perform on it,
to ensure it meets latest minecraft expectations.
2017-07-26 23:44:29 -04:00
Aikar
4a35e438e9 Improve the Saddle API for Horses
Not all horses with Saddles have armor. This lets us break up the horses with saddles
and access their saddle state separately from an interface shared with Armor.
2017-07-26 23:44:29 -04:00
Shane Freeder
6177f2d61e Add missing coverages for getTileEntity in order to attempt to avoid exeptions when calling getTileEntity (#797) 2017-07-26 23:11:09 -04:00
willies952002
c86f61f8af Allow Changing of Player Sample in ServerListPingEvent 2017-07-26 23:06:56 -04:00
Zach Brown
c6c6b4f69a
JDK-8176055: Fix heap dumps on Java 8u141+
In Java 8u141 (1.8.0_141-b15) and newer, the
com.sun.management.HotSpotDiagnostic::dumpHeap API has changed and now
requires all heap dumps to end with the .hprof file extension.

Before this change, servers running 8u141 would be unable to perform a
heap dump.

For more information, please see the official release notes of Java 8
Update 141, linked below.
http://www.oracle.com/technetwork/java/javase/8u141-relnotes-3720385.html
2017-07-26 20:28:56 -05:00
Aikar
dcd4f3710f Upstream update 2017-07-26 21:12:40 -04:00
Zach Brown
43543c78c4
Update upstream CB 2017-07-24 06:47:43 -05:00
Zach Brown
c9b00ce95d
Update upstream CB 2017-07-22 20:16:06 -05:00
Zach
35dbaf3f6b Merge pull request #793 from electronicboy/master 2017-07-19 18:23:18 -05:00
Shane Freeder
8d10a38779
Update C 2017-07-19 23:02:48 +01:00