DemonWav / CraftBukkit / 8269b993936

Commits

md_5 authored 8269b993936 19 Mar 2016

SPIGOT-1968: Use correct explosion yield

Modified


83 83	+ if (bblock.getType() != org.bukkit.Material.AIR) {
84 84	+ blockList.add(bblock);
85 85	+ }
86 86	+ }
87 87	+
88 88	+ boolean cancelled;
89 89	+ List<org.bukkit.block.Block> bukkitBlocks;
90 90	+ float yield;
91 91	+
92 92	+ if (explode != null) {
93 -	+ EntityExplodeEvent event = new EntityExplodeEvent(explode, location, blockList, 0.3F);
93 +	+ EntityExplodeEvent event = new EntityExplodeEvent(explode, location, blockList, 1.0F / this.size);
94 94	+ this.world.getServer().getPluginManager().callEvent(event);
95 95	+ cancelled = event.isCancelled();
96 96	+ bukkitBlocks = event.blockList();
97 97	+ yield = event.getYield();
98 98	+ } else {
99 -	+ BlockExplodeEvent event = new BlockExplodeEvent(location.getBlock(), blockList, 0.3F);
99 +	+ BlockExplodeEvent event = new BlockExplodeEvent(location.getBlock(), blockList, 1.0F / this.size);
100 100	+ this.world.getServer().getPluginManager().callEvent(event);
101 101	+ cancelled = event.isCancelled();
102 102	+ bukkitBlocks = event.blockList();
103 103	+ yield = event.getYield();
104 104	+ }
105 105	+
106 106	+ this.blocks.clear();
107 107	+
108 108	+ for (org.bukkit.block.Block bblock : bukkitBlocks) {
109 109	+ BlockPosition coords = new BlockPosition(bblock.getX(), bblock.getY(), bblock.getZ());