diff --git a/plugins/chat.js b/plugins/chat.js
index 815a8a2..f2c0220 100644
--- a/plugins/chat.js
+++ b/plugins/chat.js
@@ -18,12 +18,7 @@ function inject(bot) {
   bot.on('parsed_chat', (message, packet) => {
     try {
       const raw = message.toMotd().substring(0, 32767);
-      if (raw.match(/.* .*:§r .*/g)) {
-        // if (packet.sender === '00000000-0000-0000-0000-000000000000') return;
-        const username = raw.replace(/.*?\[.*?\] /, '').replace(/:.*/g, '').replace(/§#....../gm, '');
-        const message = raw.split(':§r ')[1];
-        bot.emit('message', username, message, packet.sender);
-      } else if (raw.match(/.* .*: .*/g)) {
+      if (raw.match(/.* .*: .*/g)) {
         // if (packet.sender === '00000000-0000-0000-0000-000000000000') return;
         const username = raw.replace(/.*?\[.*?\] /, '').replace(/:.*/g, '').replace(/§#....../gm, '');
         const message = raw.split(': ')[1];
diff --git a/plugins/core.js b/plugins/core.js
index b6eec5d..299b42b 100644
--- a/plugins/core.js
+++ b/plugins/core.js
@@ -116,8 +116,6 @@ function inject(bot) {
     //   if (core.start===packet.chunkCoordinates || core.end===packet.chunkCoordinates) fillCore();
     // });
 
-    // bot.on('position', fillCore);
-
     bot.on('end', () => {
       clearInterval(interval);
     });
@@ -138,6 +136,9 @@ function inject(bot) {
     }
 
     bot.core.loopPlace();
+
+    bot.on('position', bot.core.loopPlace);
+
     const interval = setInterval(() => {
       bot.core.loopPlace();
     }, config.core.refillInterval);